With the fix of 4929cad323afc87404752a1e88664a7f42cbb737,

[nmh] / sbr / encode_rfc2047.c

diff --git a/sbr/encode_rfc2047.c b/sbr/encode_rfc2047.c
index ac340f71cced69ee6ecca5a924e89ac0c6292f89..537a275e345c14e8535d50ce2b1fbbeffca66f75 100644 (file)
--- 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.
@@ -517,8 +517,8 @@ unfold_header(char **value, int len)
             * This has the side effect of stripping off the final newline
             * for the header; we put it back in the encoding routine.
             */
-           while (is_fws(*q++))
-               ;
+           while (is_fws(*q))
+               q++;
            if (*q == '\0')
                break;
 
@@ -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:
@@ -721,8 +730,8 @@ do_reformat:
         */
 
        if (groupflag && ! mn->m_ingrp) {
-           output = add("; ", output);
-           column += 2;
+           output = add(";", output);
+           column += 1;
        }
 
        groupflag = mn->m_ingrp;