git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
header.c
diff --git
a/src/src/header.c
b/src/src/header.c
index 9bd376633c5f4b8bc2751224073119b4549be5ec..a4dd6e72e487acee1bd5e5c2f3c58e28b4db0c54 100644
(file)
--- a/
src/src/header.c
+++ b/
src/src/header.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2016 */
/* Copyright (c) University of Cambridge 1995 - 2016 */
-/* Copyright (c) The Exim Maintainers 2020 - 2021 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
#include "exim.h"
#include "exim.h"
@@
-102,7
+103,7
@@
gstring gs;
if (!header_last) return NULL;
if (!header_last) return NULL;
-gs.s = buf = store_get(HEADER_ADD_BUFFER_SIZE,
FALSE
);
+gs.s = buf = store_get(HEADER_ADD_BUFFER_SIZE,
GET_UNTAINTED
);
gs.size = HEADER_ADD_BUFFER_SIZE;
gs.ptr = 0;
gs.size = HEADER_ADD_BUFFER_SIZE;
gs.ptr = 0;
@@
-182,7
+183,7
@@
for (p = q = gs.s; *p; p = q)
if (*(++q) != ' ' && *q != '\t') break;
}
if (*(++q) != ' ' && *q != '\t') break;
}
- new = store_get(sizeof(header_line),
FALSE
);
+ new = store_get(sizeof(header_line),
GET_UNTAINTED
);
new->text = string_copyn(p, q - p);
new->slen = q - p;
new->type = type;
new->text = string_copyn(p, q - p);
new->slen = q - p;
new->type = type;
@@
-368,7
+369,7
@@
Returns: cond if the header exists and contains one of the strings;
/* First we have a local subroutine to handle a single pattern */
static BOOL
/* First we have a local subroutine to handle a single pattern */
static BOOL
-one_pattern_match(uschar *
name, int slen, BOOL has_addresses, uschar *
pattern)
+one_pattern_match(uschar *
name, int slen, BOOL has_addresses, uschar *
pattern)
{
BOOL yield = FALSE;
const pcre2_code *re = NULL;
{
BOOL yield = FALSE;
const pcre2_code *re = NULL;
@@
-376,7
+377,7
@@
const pcre2_code *re = NULL;
/* If the pattern is a regex, compile it. Bomb out if compiling fails; these
patterns are all constructed internally and should be valid. */
/* If the pattern is a regex, compile it. Bomb out if compiling fails; these
patterns are all constructed internally and should be valid. */
-if (*pattern == '^') re = regex_must_compile(pattern,
TRUE
, FALSE);
+if (*pattern == '^') re = regex_must_compile(pattern,
MCS_CASELESS
, FALSE);
/* Scan for the required header(s) and scan each one */
/* Scan for the required header(s) and scan each one */
@@
-443,7
+444,7
@@
return yield;
/* The externally visible interface */
BOOL
/* The externally visible interface */
BOOL
-header_match(uschar *
name, BOOL has_addresses, BOOL cond, string_item *
strings,
+header_match(uschar *
name, BOOL has_addresses, BOOL cond, string_item *
strings,
int count, ...)
{
va_list ap;
int count, ...)
{
va_list ap;