Fix filename length check in mime-handling

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

diff --git a/src/src/mime.c b/src/src/mime.c
index 45cec29a5e72151c12c63b9dd5e06cb9abd17258..5d3505a7cd60c08fd45bef737e9d2cf42ac2c1ab 100644 (file)
--- 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