X-Git-Url: https://git.hcoop.net/hcoop/debian/exim4.git/blobdiff_plain/493d55f6840d04ef186778724fc67530b1600113..0baa7b9df9e8d0188307c635776394b0db691e7d:/src/header.c diff --git a/src/header.c b/src/header.c index 8136c69..decd0cc 100644 --- a/src/header.c +++ b/src/header.c @@ -2,7 +2,7 @@ * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2009 */ +/* Copyright (c) University of Cambridge 1995 - 2016 */ /* 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 - received header is allocated and when it is acutally filled in. We want + received header is allocated and when it is actually filled in. We want that header to be first, so skip it for now. */ if (header_list->text == NULL) @@ -132,7 +132,7 @@ else { int len = Ustrlen(name); - /* Find the first non-deleted header witht the correct name. */ + /* Find the first non-deleted header with the correct name. */ 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++) - { if (one_pattern_match(name, slen, has_addresses, va_arg(ap, uschar *))) + { + va_end(ap); return cond; - } + } va_end(ap); return !cond;