projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARC: enhance debug for signing; explicitly init signing context
[exim.git]
/
src
/
src
/
mime.c
diff --git
a/src/src/mime.c
b/src/src/mime.c
index 36737e9eb235a1e20967ee54e2755ea17b6566db..47e742b751923406eb6176894222ea60c102fbe1 100644
(file)
--- a/
src/src/mime.c
+++ b/
src/src/mime.c
@@
-2,9
+2,9
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
,
2015
+/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2004
-
2015
* License: GPL
* License: GPL
- * Copyright (c) The Exim Maintainers 201
6
+ * Copyright (c) The Exim Maintainers 201
5 - 2018
*/
#include "exim.h"
*/
#include "exim.h"
@@
-490,6
+490,7
@@
while ((c = *fname))
val = string_catn(val, fname++, 1);
val = string_catn(val, US"?=", 2);
val = string_catn(val, fname++, 1);
val = string_catn(val, US"?=", 2);
+*len = val->ptr;
return string_from_gstring(val);
}
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);
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
decoding_failed = TRUE;
else
/* build up a decoded filename over successive