git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6fcb317
)
Use non-releasable memory for regex line-buffer
author
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 13 Feb 2024 17:34:19 +0000
(17:34 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 13 Feb 2024 17:34:19 +0000
(17:34 +0000)
Broken-by: 5aacb69f5c8
src/src/regex.c
patch
|
blob
|
history
diff --git
a/src/src/regex.c
b/src/src/regex.c
index d5dc1025852eda58eff36fe78efed2f98dce7f12..642b9cf9322f324ba0db9cbccde7537e6a47490b 100644
(file)
--- a/
src/src/regex.c
+++ b/
src/src/regex.c
@@
-118,7
+118,6
@@
regex(const uschar ** listptr, BOOL cacheable)
unsigned long mbox_size;
FILE * mbox_file;
pcre_list * re_list_head;
unsigned long mbox_size;
FILE * mbox_file;
pcre_list * re_list_head;
-uschar * linebuffer;
long f_pos = 0;
int ret = FAIL, cnt, lcount = REGEX_LOOPCOUNT_STORE_RESET;
rmark reset_point;
long f_pos = 0;
int ret = FAIL, cnt, lcount = REGEX_LOOPCOUNT_STORE_RESET;
rmark reset_point;
@@
-151,16
+150,15
@@
reset_point = store_mark();
if ((re_list_head = compile(*listptr, cacheable, &cnt)))
{
/* match each line against all regexes */
if ((re_list_head = compile(*listptr, cacheable, &cnt)))
{
/* match each line against all regexes */
- linebuffer = store_get(32767, GET_TAINTED);
- while (fgets(CS linebuffer, 32767, mbox_file))
+ while (fgets(CS big_buffer, big_buffer_size, mbox_file))
{
if ( mime_stream && mime_current_boundary /* check boundary */
{
if ( mime_stream && mime_current_boundary /* check boundary */
- && Ustrncmp(
line
buffer, "--", 2) == 0
- && Ustrncmp((
line
buffer+2), mime_current_boundary,
+ && Ustrncmp(
big_
buffer, "--", 2) == 0
+ && Ustrncmp((
big_
buffer+2), mime_current_boundary,
Ustrlen(mime_current_boundary)) == 0)
break; /* found boundary */
Ustrlen(mime_current_boundary)) == 0)
break; /* found boundary */
- if ((ret = matcher(re_list_head,
linebuffer, (int)Ustrlen(line
buffer))) == OK)
+ if ((ret = matcher(re_list_head,
big_buffer, (int)Ustrlen(big_
buffer))) == OK)
break;
if ((lcount -= cnt) <= 0)
break;
if ((lcount -= cnt) <= 0)