X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/322ec5e23a4560d27747eefef168cf8f97553b17..2d82da244d02a79d994b9020099cfb627a8b32ed:/sbr/encode_rfc2047.c?ds=sidebyside

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index ac2b6dc3..537a275e 100644
--- a/sbr/encode_rfc2047.c
+++ b/sbr/encode_rfc2047.c
@@ -161,7 +161,7 @@ field_encode_quoted(const char *name, char **value, const char *charset,
 {
     int prefixlen = name ? strlen(name) + 2: 0, outlen = 0, column, newline = 1;
     int charsetlen = strlen(charset), utf8;
-    char *output = NULL, *p, *q;
+    char *output = NULL, *p, *q = NULL;
 
     /*
      * Right now we just encode the whole thing.  Maybe later on we'll
@@ -313,7 +313,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.
@@ -545,12 +545,12 @@ field_encode_address(const char *name, char **value, int encoding,
 {
     int prefixlen = strlen(name) + 2, column = prefixlen, groupflag;
     int asciichars, specialchars, eightbitchars, reformat = 0, errflag = 0;
-    int retval;
     size_t len;
     char *mp, *cp = NULL, *output = NULL;
     char *tmpbuf = NULL;
     size_t tmpbufsize = 0;
     struct mailname *mn;
+    char errbuf[BUFSIZ];
 
     /*
      * Because these are addresses, we need to handle them individually.
@@ -567,7 +567,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(mp, "%s", errbuf);
 	    errflag++;
 	    continue;
 	}
@@ -610,13 +611,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    switch (encoding) {
 
 	    case CE_BASE64:
-	    	retval = field_encode_base64(NULL, &mn->m_pers, charset);
+	    	if (field_encode_base64(NULL, &mn->m_pers, charset)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    case CE_QUOTED:
-	    	retval = field_encode_quoted(NULL, &mn->m_pers, charset,
-					     asciichars,
-					     eightbitchars + specialchars, 1);
+	    	if (field_encode_quoted(NULL, &mn->m_pers, charset, asciichars,
+					eightbitchars + specialchars, 1)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    default:
@@ -641,9 +647,7 @@ field_encode_address(const char *name, char **value, int encoding,
 	if (! mn->m_note)
 	    goto do_reformat;
 
-	len = strlen(mn->m_note);
-
-	if ((len = strlen(mn->m_pers)) + 1 > tmpbufsize) {
+	if ((len = strlen(mn->m_note)) + 1 > tmpbufsize) {
 	    tmpbuf = mh_xrealloc(tmpbuf, tmpbufsize = len + 1);
 	}
 
@@ -670,13 +674,18 @@ field_encode_address(const char *name, char **value, int encoding,
 	    switch (encoding) {
 
 	    case CE_BASE64:
-	    	retval = field_encode_base64(NULL, &tmpbuf, charset);
+	    	if (field_encode_base64(NULL, &tmpbuf, charset)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    case CE_QUOTED:
-	    	retval = field_encode_quoted(NULL, &tmpbuf, charset,
-					     asciichars,
-					     eightbitchars + specialchars, 1);
+	    	if (field_encode_quoted(NULL, &tmpbuf, charset, asciichars,
+					eightbitchars + specialchars, 1)) {
+		    errflag++;
+		    goto out;
+		}
 		break;
 
 	    default: