Import Debian changes 4.89-2+deb9u4

[hcoop/debian/exim4.git] / debian / patches / 85_Fix-crash-in-mime-acl-when-a-parameter-is-unterminat.patch

diff --git a/debian/patches/85_Fix-crash-in-mime-acl-when-a-parameter-is-unterminat.patch b/debian/patches/85_Fix-crash-in-mime-acl-when-a-parameter-is-unterminat.patch
deleted file mode 100644 (file)
index a57551c..0000000
--- a/debian/patches/85_Fix-crash-in-mime-acl-when-a-parameter-is-unterminat.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From bf485bf34df3fc2214765497a5552851c6a8977a Mon Sep 17 00:00:00 2001
-From: Jeremy Harris <jgh146exb@wizmail.org>
-Date: Tue, 30 Dec 2014 20:39:02 +0000
-Subject: [PATCH] Fix crash in mime acl when a parameter is unterminated
-
-Verified-by: Wolfgang Breyha <wbreyha@gmx.net>
----
- src/mime.c                  | 33 +++++++++++----------------------
- test/confs/4000                 |  1 +
- test/log/4000                   |  9 ++++++---
- test/mail/4000.userx            | 36 ++++++++++++++++++++++++++++++++++++
- test/scripts/4000-scanning/4000 | 27 +++++++++++++++++++++++++++
- test/stdout/4000                | 11 +++++++++++
- 6 files changed, 92 insertions(+), 25 deletions(-)
-
-diff --git a/src/mime.c b/src/mime.c
-index a61e9f2..e5fe476 100644
---- a/src/mime.c
-+++ b/src/mime.c
-@@ -599,46 +599,35 @@ NEXT_PARAM_SEARCH:
-           /* found an interesting parameter? */
-           if (strncmpic(mp->name, p, mp->namelen) == 0)
-             {
--            uschar * q = p + mp->namelen;
--            int plen = 0;
-             int size = 0;
-             int ptr = 0;
- 
-             /* yes, grab the value and copy to its corresponding expansion variable */
--            while(*q && *q != ';')            /* ; terminates */
--              if (*q == '"')
-+            p += mp->namelen;
-+            while(*p && *p != ';')            /* ; terminates */
-+              if (*p == '"')
-                 {
--                q++;                          /* skip leading " */
--                plen++;                       /* and account for the skip */
--                while(*q && *q != '"')        /* " protects ; */
--                  {
--                  param_value = string_cat(param_value, &size, &ptr, q++, 1);
--                  plen++;
--                  }
--                if (*q)
--                  {
--                  q++;                        /* skip trailing " */
--                  plen++;
--                  }
-+                p++;                          /* skip leading " */
-+                while(*p && *p != '"')        /* " protects ; */
-+                  param_value = string_cat(param_value, &size, &ptr, p++, 1);
-+                if (*p) p++;                  /* skip trailing " */
-                 }
-               else
--                {
--                param_value = string_cat(param_value, &size, &ptr, q++, 1);
--                plen++;
--                }
-+                param_value = string_cat(param_value, &size, &ptr, p++, 1);
-+            if (*p) p++;                      /* skip trailing ; */
- 
-             if (param_value)
-               {
-+              uschar * dummy;
-               param_value[ptr++] = '\0';
- 
-               param_value = rfc2047_decode(param_value,
--                    check_rfc2047_length, NULL, 32, NULL, &q);
-+                    check_rfc2047_length, NULL, 32, NULL, &dummy);
-               debug_printf("Found %s MIME parameter in %s header, "
-                     "value is '%s'\n", mp->name, mime_header_list[i].name,
-                     param_value);
-               }
-             *mp->value = param_value;
--            p += mp->namelen + plen + 1;      /* name=, content, ; */
-             goto NEXT_PARAM_SEARCH;
-           }
-         }