Fix invalid pointer arithmetic.

[nmh] / sbr / encode_rfc2047.c

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index d1ccd2e973c8bd5a6d889f18e62899e6a56ff443..0ded2e932cfa88fae443df7c9a96c1aa80307a0e 100644 (file)
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -1,5 +1,4 @@
-/*
- * Routines to encode message headers using RFC 2047-encoding.
+/* encode_rfc2047.c -- encode message headers using RFC 2047 encoding.
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -10,6 +9,8 @@
 #include <h/mhparse.h>
 #include <h/addrsbr.h>
 #include <h/utils.h>
+#include "base64.h"
+#include "unquote.h"
 
 /*
  * List of headers that contain addresses and as a result require special
@@ -107,7 +108,7 @@ encode_rfc2047(const char *name, char **value, int encoding,
        charset = write_charset_8bit();
 
     if (strcasecmp(charset, "US-ASCII") == 0) {
-       advise(NULL, "Cannot use US-ASCII with 8 bit characters in header");
+       inform("Cannot use US-ASCII with 8 bit characters in header");
        return 1;
     }
 
@@ -146,7 +147,7 @@ encode_rfc2047(const char *name, char **value, int encoding,
                                   eightbitcount + qpspecialcount, 0);
 
     default:
-       advise(NULL, "Internal error: unknown RFC-2047 encoding type");
+       inform("Internal error: unknown RFC-2047 encoding type");
        return 1;
     }
 }
@@ -289,7 +290,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
     if (q == NULL) {
        /* This should never happen, but just in case.  Found by
           clang static analyzer. */
-       admonish (NULL, "null output encoding for %s", *value);
+       inform("null output encoding for %s, continuing...", *value);
        return 1;
     }
     *q++ = '?';
@@ -381,7 +382,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
        numencode = strbase64(ENCODELINELIMIT - (q - linestart) - 2);
 
        if (numencode <= 0) {
-           advise(NULL, "Internal error: tried to encode %d characters "
+           inform("Internal error: tried to encode %d characters "
                   "in base64", numencode);
            return 1;
        }
@@ -405,7 +406,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
                numencode--;
 
            if (numencode == 0) {
-               advise(NULL, "Internal error: could not find start of "
+               inform("Internal error: could not find start of "
                       "UTF-8 character when base64 encoding header");
                return 1;
            }
@@ -413,7 +414,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
 
        if (writeBase64raw((unsigned char *) p, numencode,
                           (unsigned char *) q) != OK) {
-           advise(NULL, "Internal error: base64 encoding of header failed");
+           inform("Internal error: base64 encoding of header failed");
            return 1;
        }
 
@@ -460,7 +461,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
 
     if (writeBase64raw((unsigned char *) p, strlen(p),
                       (unsigned char *) q) != OK) {
-       advise(NULL, "Internal error: base64 encoding of header failed");
+       inform("Internal error: base64 encoding of header failed");
        return 1;
     }
 
@@ -574,7 +575,7 @@ field_encode_address(const char *name, char **value, int encoding,
 
     for (groupflag = 0; (mp = getname(*value)); ) {
        if ((mn = getm(mp, NULL, 0, errbuf, sizeof(errbuf))) == NULL) {
-           advise(NULL, "%s: %s", errbuf, mp);
+           inform("%s: %s", errbuf, mp);
            errflag++;
            continue;
        }
@@ -632,7 +633,7 @@ field_encode_address(const char *name, char **value, int encoding,
                break;
 
            default:
-               advise(NULL, "Internal error: unknown RFC-2047 encoding type");
+               inform("Internal error: unknown RFC-2047 encoding type");
                errflag++;
                goto out;
            }
@@ -658,7 +659,7 @@ field_encode_address(const char *name, char **value, int encoding,
        }
 
        if (mn->m_note[0] != '(' || mn->m_note[len - 1] != ')') {
-           advise(NULL, "Internal error: Invalid note field \"%s\"",
+           inform("Internal error: Invalid note field \"%s\"",
                   mn->m_note);
            errflag++;
            goto out;
@@ -695,7 +696,7 @@ field_encode_address(const char *name, char **value, int encoding,
                break;
 
            default:
-               advise(NULL, "Internal error: unknown RFC-2047 encoding type");
+               inform("Internal error: unknown RFC-2047 encoding type");
                errflag++;
                goto out;
            }
@@ -737,7 +738,7 @@ do_reformat:
 
        if (groupflag && ! mn->m_ingrp) {
            output = add(";", output);
-           column += 1;
+           column++;
        }
 
        groupflag = mn->m_ingrp;
@@ -798,8 +799,8 @@ do_reformat:
     output = NULL;
 
 out:
-    mh_xfree(tmpbuf);
-    mh_xfree(output);
+    free(tmpbuf);
+    free(output);
 
     return errflag > 0;
 }