* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
+/*
+ * Copyright (c) The Exim Maintainers 2016 - 2022
+ * Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2016 - 2018
*/
/* Code for matching regular expressions against headers and body.
uschar errbuf[128];
pcre2_get_error_message(err, errbuf, sizeof(errbuf));
log_write(0, LOG_MAIN,
- "regex acl condition warning - error in regex '%s': %s at offset %l, skipped.",
+ "regex acl condition warning - error in regex '%s': %s at offset %ld, skipped.",
regex_string, errbuf, (long)pcre_erroffset);
continue;
}
- ri = store_get(sizeof(pcre_list), FALSE);
+ ri = store_get(sizeof(pcre_list), GET_UNTAINTED);
ri->re = re;
ri->pcre_text = regex_string;
ri->next = re_list_head;
PCRE2_UCHAR * cstr;
PCRE2_SIZE cslen;
pcre2_substring_get_bynumber(md, nn, &cstr, &cslen);
- regex_vars[nn-1] = US cstr;
+ regex_vars[nn-1] = CUS cstr;
}
return OK;
return FAIL; /* no regexes -> nothing to do */
/* match each line against all regexes */
-linebuffer = store_get(32767, TRUE); /* tainted */
+linebuffer = store_get(32767, GET_TAINTED);
while (fgets(CS linebuffer, 32767, mbox_file))
{
if ( mime_stream && mime_current_boundary /* check boundary */
}
/* get 32k memory, tainted */
-mime_subject = store_get(32767, TRUE);
+mime_subject = store_get(32767, GET_TAINTED);
mime_subject_len = fread(mime_subject, 1, 32766, f);