HCoop
/
hcoop
/
debian
/
exim4.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import Debian changes 4.89-2+deb9u4
[hcoop/debian/exim4.git]
/
src
/
header.c
diff --git
a/src/header.c
b/src/header.c
index
8136c69
..
decd0cc
100644
(file)
--- a/
src/header.c
+++ b/
src/header.c
@@
-2,7
+2,7
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
09
*/
+/* Copyright (c) University of Cambridge 1995 - 20
16
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-119,7
+119,7
@@
if (name == NULL)
hptr = &header_list;
/* header_list->text can be NULL if we get here between when the new
hptr = &header_list;
/* header_list->text can be NULL if we get here between when the new
- received header is allocated and when it is ac
ut
ally filled in. We want
+ received header is allocated and when it is ac
tu
ally filled in. We want
that header to be first, so skip it for now. */
if (header_list->text == NULL)
that header to be first, so skip it for now. */
if (header_list->text == NULL)
@@
-132,7
+132,7
@@
else
{
int len = Ustrlen(name);
{
int len = Ustrlen(name);
- /* Find the first non-deleted header with
t
the correct name. */
+ /* Find the first non-deleted header with the correct name. */
for (hptr = &header_list; (h = *hptr) != NULL; hptr = &(h->next))
{
for (hptr = &header_list; (h = *hptr) != NULL; hptr = &(h->next))
{
@@
-450,10
+450,11
@@
for (s = strings; s != NULL; s = s->next)
va_start(ap, count);
for (i = 0; i < count; i++)
va_start(ap, count);
for (i = 0; i < count; i++)
- {
if (one_pattern_match(name, slen, has_addresses, va_arg(ap, uschar *)))
if (one_pattern_match(name, slen, has_addresses, va_arg(ap, uschar *)))
+ {
+ va_end(ap);
return cond;
return cond;
- }
+
}
va_end(ap);
return !cond;
va_end(ap);
return !cond;