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
constification
[exim.git]
/
src
/
src
/
regex.c
diff --git
a/src/src/regex.c
b/src/src/regex.c
index 233a56bce36db73bf4ef5467ecc4ce7b9f03aeec..a3d6659a6428e1003bd2ef93ca900ccb9f4f93e2 100644
(file)
--- a/
src/src/regex.c
+++ b/
src/src/regex.c
@@
-4,7
+4,7
@@
/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
* License: GPL
/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2016
+ * Copyright (c) The Exim Maintainers 2016
- 2018
*/
/* Code for matching regular expressions against headers and body.
*/
/* Code for matching regular expressions against headers and body.
@@
-17,7
+17,7
@@
/* Structure to hold a list of Regular expressions */
typedef struct pcre_list {
/* Structure to hold a list of Regular expressions */
typedef struct pcre_list {
- pcre *re;
+ pcre
2_code
*re;
uschar *pcre_text;
struct pcre_list *next;
} pcre_list;
uschar *pcre_text;
struct pcre_list *next;
} pcre_list;
@@
-32,8
+32,6
@@
compile(const uschar * list)
{
int sep = 0;
uschar *regex_string;
{
int sep = 0;
uschar *regex_string;
-const char *pcre_error;
-int pcre_erroffset;
pcre_list *re_list_head = NULL;
pcre_list *ri;
pcre_list *re_list_head = NULL;
pcre_list *ri;
@@
-41,19
+39,23
@@
pcre_list *ri;
while ((regex_string = string_nextinlist(&list, &sep, NULL, 0)))
if (strcmpic(regex_string, US"false") != 0 && Ustrcmp(regex_string, "0") != 0)
{
while ((regex_string = string_nextinlist(&list, &sep, NULL, 0)))
if (strcmpic(regex_string, US"false") != 0 && Ustrcmp(regex_string, "0") != 0)
{
- pcre *re;
+ pcre2_code * re;
+ int err;
+ PCRE2_SIZE pcre_erroffset;
/* compile our regular expression */
/* compile our regular expression */
- if (!(re = pcre
_compile( CS regex_string
,
-
0, &pcre_error, &pcre_erroffset, NULL
)))
+ if (!(re = pcre
2_compile( (PCRE2_SPTR) regex_string, PCRE2_ZERO_TERMINATED
,
+
0, &err, &pcre_erroffset, pcre_cmp_ctx
)))
{
{
+ uschar errbuf[128];
+ pcre2_get_error_message(err, errbuf, sizeof(errbuf));
log_write(0, LOG_MAIN,
log_write(0, LOG_MAIN,
- "regex acl condition warning - error in regex '%s': %s at offset %d, skipped.",
- regex_string,
pcre_error,
pcre_erroffset);
+ "regex acl condition warning - error in regex '%s': %s at offset %
l
d, skipped.",
+ regex_string,
errbuf, (long)
pcre_erroffset);
continue;
}
continue;
}
- ri = store_get(sizeof(pcre_list));
+ ri = store_get(sizeof(pcre_list)
, FALSE
);
ri->re = re;
ri->pcre_text = regex_string;
ri->next = re_list_head;
ri->re = re;
ri->pcre_text = regex_string;
ri->next = re_list_head;
@@
-65,28
+67,31
@@
return re_list_head;
static int
matcher(pcre_list * re_list_head, uschar * linebuffer, int len)
{
static int
matcher(pcre_list * re_list_head, uschar * linebuffer, int len)
{
-pcre
_list * ri
;
+pcre
2_match_data * md = pcre2_match_data_create(REGEX_VARS + 1, pcre_gen_ctx)
;
-for
(
ri = re_list_head; ri; ri = ri->next)
+for
(pcre_list *
ri = re_list_head; ri; ri = ri->next)
{
{
- int ovec[3*(REGEX_VARS+1)];
- int n, nn;
+ int n;
/* try matcher on the line */
/* try matcher on the line */
- n = pcre_exec(ri->re, NULL, CS linebuffer, len, 0, 0, ovec, nelem(ovec));
- if (n > 0)
+ if ((n = pcre2_match(ri->re, (PCRE2_SPTR)linebuffer, len, 0, 0, md, pcre_mtc_ctx)) > 0)
{
Ustrncpy(regex_match_string_buffer, ri->pcre_text,
sizeof(regex_match_string_buffer)-1);
regex_match_string = regex_match_string_buffer;
{
Ustrncpy(regex_match_string_buffer, ri->pcre_text,
sizeof(regex_match_string_buffer)-1);
regex_match_string = regex_match_string_buffer;
- for (nn = 1; nn < n; nn++)
- regex_vars[nn-1] =
- string_copyn(linebuffer + ovec[nn*2], ovec[nn*2+1] - ovec[nn*2]);
+ for (int nn = 1; nn < n; nn++)
+ {
+ PCRE2_UCHAR * cstr;
+ PCRE2_SIZE cslen;
+ pcre2_substring_get_bynumber(md, nn, &cstr, &cslen);
+ regex_vars[nn-1] = CUS cstr;
+ }
return OK;
}
}
return OK;
}
}
+pcre2_match_data_free(md);
return FAIL;
}
return FAIL;
}
@@
-105,7
+110,7
@@
regex_match_string = NULL;
if (!mime_stream) /* We are in the DATA ACL */
{
if (!mime_stream) /* We are in the DATA ACL */
{
- if (!(mbox_file = spool_mbox(&mbox_size, NULL)))
+ if (!(mbox_file = spool_mbox(&mbox_size, NULL
, NULL
)))
{ /* error while spooling */
log_write(0, LOG_MAIN|LOG_PANIC,
"regex acl condition: error while creating mbox spool file");
{ /* error while spooling */
log_write(0, LOG_MAIN|LOG_PANIC,
"regex acl condition: error while creating mbox spool file");
@@
-128,7
+133,7
@@
if (!(re_list_head = compile(*listptr)))
return FAIL; /* no regexes -> nothing to do */
/* match each line against all regexes */
return FAIL; /* no regexes -> nothing to do */
/* match each line against all regexes */
-linebuffer = store_get(32767
);
+linebuffer = store_get(32767
, TRUE); /* tainted */
while (fgets(CS linebuffer, 32767, mbox_file))
{
if ( mime_stream && mime_current_boundary /* check boundary */
while (fgets(CS linebuffer, 32767, mbox_file))
{
if ( mime_stream && mime_current_boundary /* check boundary */
@@
-148,7
+153,12
@@
if (!mime_stream)
else
{
clearerr(mime_stream);
else
{
clearerr(mime_stream);
- fseek(mime_stream, f_pos, SEEK_SET);
+ if (fseek(mime_stream, f_pos, SEEK_SET) == -1)
+ {
+ log_write(0, LOG_MAIN|LOG_PANIC,
+ "regex acl condition: mime_stream: %s", strerror(errno));
+ clearerr(mime_stream);
+ }
}
return ret;
}
return ret;
@@
-193,8
+203,8
@@
if (!(f = fopen(CS mime_decoded_filename, "rb")))
return DEFER;
}
return DEFER;
}
-/* get 32k memory */
-mime_subject = store_get(32767);
+/* get 32k memory
, tainted
*/
+mime_subject = store_get(32767
, TRUE
);
mime_subject_len = fread(mime_subject, 1, 32766, f);
mime_subject_len = fread(mime_subject, 1, 32766, f);