From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 26 Nov 2017 15:22:38 +0000 (+0000)
Subject: Fix filename length check in mime-handling
X-Git-Tag: exim-4_90_RC3~4
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/b378c1f3723630ef2dcf19dcf00b93eb6639bcb8

Fix filename length check in mime-handling
---

diff --git a/src/src/mime.c b/src/src/mime.c
index 45cec29a5..5d3505a7c 100644
--- a/src/src/mime.c
+++ b/src/src/mime.c
@@ -490,6 +490,7 @@ while ((c = *fname))
     val = string_catn(val, fname++, 1);
 
 val = string_catn(val, US"?=", 2);
+*len = val->ptr;
 return string_from_gstring(val);
 }
 
@@ -646,9 +647,7 @@ while(1)
 		  NULL, &err_msg);
 		DEBUG(D_acl) debug_printf_indent("MIME:    plain-name %s\n", temp_string);
 
-		size = Ustrlen(temp_string);
-
-		if (size == slen)
+		if (!temp_string || (size = Ustrlen(temp_string))  == slen)
 		  decoding_failed = TRUE;
 		else
 		  /* build up a decoded filename over successive