postfix-3.3.17

diff --git a/postfix/HISTORY b/postfix/HISTORY
index 67706bcadfff43d88d26db16d817405b585670e2..237e2435380d8b6e5a34c7b78b85f82966910543 100644 (file)
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -23719,3 +23719,18 @@ Apologies for any names omitted.
        causing unnecessary dnssec_probe activity. The default is now
        "dane" when smtp_tls_security_level is "dane", otherwise it is
        "may". File: global/mail_params.h.
+
+20210411
+
+       Null pointer bug (introduced: Postfix 3.0) after an inline:
+       table syntax error in main.cf or master.cf. Found by Coverity,
+       reported by Jaroslav Skarvada. Based on fix by Viktor
+       Dukhovni. File: util/dict_inline.c.
+
+       Incomplete null pointer check (introduced: Postfix 2.10)
+       after truncated HaProxy version 1 handshake message. Found
+       by Coverity, reported by Jaroslav Skarvada. Fix by Viktor
+       Dukhovni. File: global/haproxy_srvr.c.
+
+       Missing null pointer check (introduced: Postfix alpha) after
+       null argv[0] value. File: global/mail_task.c.

diff --git a/postfix/src/global/haproxy_srvr.c b/postfix/src/global/haproxy_srvr.c
index db3d0c1da5982700dd1148b1cb9ca82d77e6ffe6..9779985d80dcbe32d1076e2b6195881226610bc6 100644 (file)
--- a/postfix/src/global/haproxy_srvr.c
+++ b/postfix/src/global/haproxy_srvr.c
@@ -59,6 +59,8 @@
 
 static INET_PROTO_INFO *proto_info;
 
+#define STR_OR_NULL(str) ((str) ? (str) : "(null)")
+
 /* haproxy_srvr_parse_lit - extract and validate string literal */
 
 static int haproxy_srvr_parse_lit(const char *str,...)
@@ -68,7 +70,7 @@ static int haproxy_srvr_parse_lit(const char *str,...)
     int     result = -1;
 
     if (msg_verbose)
-       msg_info("haproxy_srvr_parse: %s", str);
+       msg_info("haproxy_srvr_parse: %s", STR_OR_NULL(str));
 
     if (str != 0) {
        va_start(ap, str);
@@ -85,8 +87,10 @@ static int haproxy_srvr_parse_lit(const char *str,...)
 static int haproxy_srvr_parse_proto(const char *str, int *addr_family)
 {
     if (msg_verbose)
-       msg_info("haproxy_srvr_parse: proto=%s", str);
+       msg_info("haproxy_srvr_parse: proto=%s", STR_OR_NULL(str));
 
+    if (str == 0)
+       return (-1);
 #ifdef AF_INET6
     if (strcasecmp(str, "TCP6") == 0) {
        if (strchr((char *) proto_info->sa_family_list, AF_INET6) != 0) {
@@ -110,7 +114,8 @@ static int haproxy_srvr_parse_addr(const char *str, MAI_HOSTADDR_STR *addr,
                                           int addr_family)
 {
     if (msg_verbose)
-       msg_info("haproxy_srvr_parse: addr=%s proto=%d", str, addr_family);
+       msg_info("haproxy_srvr_parse: addr=%s proto=%d",
+                STR_OR_NULL(str), addr_family);
 
     if (str == 0 || strlen(str) >= sizeof(MAI_HOSTADDR_STR))
        return (-1);
@@ -145,7 +150,7 @@ static int haproxy_srvr_parse_addr(const char *str, MAI_HOSTADDR_STR *addr,
 static int haproxy_srvr_parse_port(const char *str, MAI_SERVPORT_STR *port)
 {
     if (msg_verbose)
-       msg_info("haproxy_srvr_parse: port=%s", str);
+       msg_info("haproxy_srvr_parse: port=%s", STR_OR_NULL(str));
     if (str == 0 || strlen(str) >= sizeof(MAI_SERVPORT_STR)
        || !valid_hostport(str, DONT_GRIPE)) {
        return (-1);

diff --git a/postfix/src/global/mail_task.c b/postfix/src/global/mail_task.c
index b1df611d40bc28acdef4e1338ab470231694e04d..893c338c18ff2036ee659cc839dc6be41694c387 100644 (file)
--- a/postfix/src/global/mail_task.c
+++ b/postfix/src/global/mail_task.c
@@ -52,6 +52,8 @@ const char *mail_task(const char *argv0)
     const char *slash;
     const char *tag;
 
+    if (argv0 == 0)
+       argv0 = "unknown";
     if (canon_name == 0)
        canon_name = vstring_alloc(10);
     if ((slash = strrchr(argv0, '/')) != 0 && slash[1])

diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 2029314430bca57b0af4fd28c970a0325202a14d..6409929e448686f1ea00ead055b103b123333430 100644 (file)
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE      "20210117"
-#define MAIL_VERSION_NUMBER    "3.3.16"
+#define MAIL_RELEASE_DATE      "20210411"
+#define MAIL_VERSION_NUMBER    "3.3.17"
 
 #ifdef SNAPSHOT
 #define MAIL_VERSION_DATE      "-" MAIL_RELEASE_DATE

diff --git a/postfix/src/util/dict_inline.c b/postfix/src/util/dict_inline.c
index eb0d36bc9f881dbe6b55107765320ba43a566f67..21c4925ec8aacb5e45a16e2d0777d1099edef23a 100644 (file)
--- a/postfix/src/util/dict_inline.c
+++ b/postfix/src/util/dict_inline.c
@@ -113,9 +113,9 @@ DICT   *dict_inline_open(const char *name, int open_flags, int dict_flags)
     dict = dict_open3(DICT_TYPE_HT, name, open_flags, dict_flags);
     dict_type_override(dict, DICT_TYPE_INLINE);
     while ((nameval = mystrtokq(&cp, CHARS_COMMA_SP, CHARS_BRACE)) != 0) {
-       if ((nameval[0] != CHARS_BRACE[0]
-            || (err = xperr = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP)) == 0)
-           && (err = split_qnameval(nameval, &vname, &value)) != 0)
+       if (nameval[0] == CHARS_BRACE[0])
+           err = xperr = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP);
+       if (err != 0 || (err = split_qnameval(nameval, &vname, &value)) != 0)
            break;
 
        /* No duplicate checks. See comments in dict_thash.c. */