SRS: fix encode for local-part with zero-length quoted element. Bug 3087

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 65da3ceadf1388f03ab334071de667a855278f04..e7f70713d881d5ecb293e2fb6b5750883a16e81f 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -145,6 +145,9 @@ JH/28 Bug 3086: Fix exinext for ipv6.  Change the format of keys in the retry
       "host addresses" in square-brackets.  This makes the parsing that
       exinext does more reliable.
 
+JH/29 Bug 3087: Fix SRS encode.  A zero-length quoted element in the local-part
+      would cause a crash.
+
 
 Exim version 4.97
 -----------------

diff --git a/src/src/expand.c b/src/src/expand.c
index 5ea4dc6d42e7d2f4550565878d752c30c5cdd941..1d121756da4db75df3a8e4f9b1873d11576d46ed 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -7117,7 +7117,7 @@ while (*s)
            gstring_release_unused(h);
            s = string_from_gstring(h);
            }
-         g = string_cat(g, s);
+         if (s) g = string_cat(g, s);
          }
 
        /* Assume that if the original local_part had quotes