X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/96da769f8bce5a6b0b1ffc6bb343b6d103c3d8bb..9322ba2854211794c27fae9468768b80b767c211:/sbr/encode_rfc2047.c

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index ab3987d6..d1ccd2e9 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -281,16 +281,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. */
+	admonish (NULL, "null output encoding for %s", *value);
+	return 1;
+    }
     *q++ = '?';
     *q++ = '=';
 
     if (prefixlen)
-    	*q++ = '\n';
+	*q++ = '\n';
 
     *q = '\0';
 
@@ -313,7 +319,7 @@ field_encode_base64(const char *name, char **value, const char *charset)
 {
     int prefixlen = name ? strlen(name) + 2 : 0, charsetlen = strlen(charset);
     int outlen = 0, numencode, curlen;
-    char *output = NULL, *p = *value, *q = NULL, *linestart;
+    char *output = NULL, *p = *value, *q = NULL, *linestart = NULL;
 
     /*
      * Skip over any leading white space.
@@ -550,6 +556,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 +573,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) {
+	    advise(NULL, "%s: %s", errbuf, mp);
 	    errflag++;
 	    continue;
 	}
@@ -735,7 +743,7 @@ do_reformat:
 	groupflag = mn->m_ingrp;
 
 	if (mn->m_gname) {
-	    cp = add(mn->m_gname, NULL);
+	    cp = mh_xstrdup(mn->m_gname);
 	}
 
 	if (reformat) {
@@ -790,11 +798,8 @@ do_reformat:
     output = NULL;
 
 out:
-
-    if (tmpbuf)
-    	free(tmpbuf);
-    if (output)
-    	free(output);
+    mh_xfree(tmpbuf);
+    mh_xfree(output);
 
     return errflag > 0;
 }