postfix-3.7-20210707

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 4e60ec2c12c6a0f1761545470041a0760a89b177..9f199119089b0b975f270ceb0a8bf12d5b6d6c91 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -25650,3 +25650,14 @@ Apologies for any names omitted.
        strtou?l() can be migrated later. Problem reported by David
        Bohman. Files: util/sane_strtol.[hc], global/compat_level.c,
        postscreen/postscreen_tests.c, util/mac_expand.c.
+
+20210705
+
+       Bugfix (introduced: Postfix 3.3): with "header_from_format
+       = standard" (the default as of Postfix 3.3) the cleanup
+       daemon crashed with a "null pointer read" error when email
+       was submitted with /usr/sbin/sendmail without From: header,
+       and an all-space full name was specified in the password
+       file, with "sendmail -F", or with the NAME environment
+       variable. Found by Renaud Metrich. File:
+       cleanup/cleanup_message.c.

diff --git a/postfix/src/cleanup/cleanup_message.c b/postfix/src/cleanup/cleanup_message.c
index 391c7119fe39a03341888c3a13f054b9f802e012..902642f19382eaaa2bb4aef7f3bf699ade905d58 100644 (file)
--- a/postfix/src/cleanup/cleanup_message.c
+++ b/postfix/src/cleanup/cleanup_message.c
@@ -776,9 +776,12 @@ static void cleanup_header_done_callback(void *context)
                } else {
                    token = tok822_alloc(TOK822_QSTRING, state->fullname);
                }
-               tok822_externalize(state->temp2, token, TOK822_STR_NONE);
-               tok822_free(token);
-               vstring_sprintf_append(state->temp2, " <%s>",
+               if (token) {
+                   tok822_externalize(state->temp2, token, TOK822_STR_NONE);
+                   tok822_free(token);
+                   vstring_strcat(state->temp2, " ");
+               }
+               vstring_sprintf_append(state->temp2, "<%s>",
                                       vstring_str(state->temp1));
                break;
 

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index d7a25e60c94e8db0e08c9e85a923b3e2407fc03a..f4f71a6a1ead5c8766b52a243a37d4e62e064fc4 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20210627"
+#define MAIL_RELEASE_DATE      "20210707"
 #define MAIL_VERSION_NUMBER    "3.7"
 
 #ifdef SNAPSHOT