X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2415c95ae0e5c6c43644a9c79f1d2e1b71ce56ba..c3238c0e:/sbr/encode_rfc2047.c?ds=sidebyside

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index 953f6e5c..238882dc 100644
--- 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
@@ -107,7 +106,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 +145,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;
     }
 }
@@ -281,16 +280,22 @@ field_encode_quoted(const char *name, char **value, const char *charset,
 	     * allow for the encoded output.
 	     */
 	    if (column + (utf8len(p) * 3) > ENCODELINELIMIT - 2) {
-	    	newline = 1;
+		newline = 1;
 	    }
 	}
     }
 
+    if (q == NULL) {
+	/* This should never happen, but just in case.  Found by
+	   clang static analyzer. */
+	inform("null output encoding for %s, continuing...", *value);
+	return 1;
+    }
     *q++ = '?';
     *q++ = '=';
 
     if (prefixlen)
-    	*q++ = '\n';
+	*q++ = '\n';
 
     *q = '\0';
 
@@ -375,7 +380,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;
 	}
@@ -399,7 +404,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;
 	    }
@@ -407,7 +412,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;
 	}
 
@@ -454,7 +459,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;
     }
 
@@ -550,6 +555,7 @@ field_encode_address(const char *name, char **value, int encoding,
     char *tmpbuf = NULL;
     size_t tmpbufsize = 0;
     struct mailname *mn;
+    char errbuf[BUFSIZ];
 
     /*
      * Because these are addresses, we need to handle them individually.
@@ -566,7 +572,8 @@ field_encode_address(const char *name, char **value, int encoding,
     output = add(" ", output);
 
     for (groupflag = 0; (mp = getname(*value)); ) {
-    	if ((mn = getm(mp, NULL, 0, AD_HOST, NULL)) == NULL) {
+    	if ((mn = getm(mp, NULL, 0, errbuf, sizeof(errbuf))) == NULL) {
+	    inform("%s: %s", errbuf, mp);
 	    errflag++;
 	    continue;
 	}
@@ -624,7 +631,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;
 	    }
@@ -650,7 +657,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;
@@ -687,7 +694,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;
 	    }
@@ -729,13 +736,13 @@ do_reformat:
 
 	if (groupflag && ! mn->m_ingrp) {
 	    output = add(";", output);
-	    column += 1;
+	    column++;
 	}
 
 	groupflag = mn->m_ingrp;
 
 	if (mn->m_gname) {
-	    cp = add(mn->m_gname, NULL);
+	    cp = mh_xstrdup(mn->m_gname);
 	}
 
 	if (reformat) {
@@ -790,11 +797,8 @@ do_reformat:
     output = NULL;
 
 out:
-
-    if (tmpbuf)
-    	free(tmpbuf);
-    if (output)
-    	free(output);
+    mh_xfree(tmpbuf);
+    mh_xfree(output);
 
     return errflag > 0;
 }