X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fheader.c;h=decd0cce69a107e43b141314a62381954295e566;hb=b6040544759110aa97f93e9ba0dd8232cd5e5188;hp=36a48b4e7eb193d2d082f4eac476640b237cb878;hpb=1ba28e2b955b005ce4825fec792df17f75a8de1e;p=user%2Fhenk%2Fcode%2Fexim.git diff --git a/src/src/header.c b/src/src/header.c index 36a48b4e7..decd0cce6 100644 --- a/src/src/header.c +++ b/src/src/header.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/header.c,v 1.8 2009/11/16 19:50:37 nm4 Exp $ */ - /************************************************* * 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. */ @@ -121,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) @@ -134,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)) { @@ -452,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;