Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / src / src / expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index 291db426abb19e0517d1c5e89b53f0701f5158ec..7b8462eef7a7f1cffb7f3c18fab41f28644a21ff 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -5261,7 +5261,7 @@ while (*s)
 
       if (!(f = Ufopen(sub_arg[0], "rb")))
         {
-        expand_string_message = string_open_failed(errno, "%s", sub_arg[0]);
+        expand_string_message = string_open_failed("%s", sub_arg[0]);
         goto EXPAND_FAILED;
         }
 
@@ -7589,13 +7589,10 @@ while (*s)
       prescribed by the RFC, if there are characters that need to be encoded */
 
       case EOP_RFC2047:
-        {
-        uschar buffer[2048];
         yield = string_cat(yield,
                            parse_quote_2047(sub, Ustrlen(sub), headers_charset,
-                             buffer, sizeof(buffer), FALSE));
+                             FALSE));
         continue;
-        }
 
       /* RFC 2047 decode */