walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix pcre2test bug when snprintf() in regerror() does not insert a binary zero.

This commit is contained in:
Philip.Hazel 2016-02-27 12:49:00 +00:00
parent 4d807dc033
commit 371bf87af6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -72,6 +72,13 @@ gcc's -Wconversion (which still throws up a lot).
15. Implemented pcre2_code_copy(), and added pushcopy and #popcopy to pcre2test 15. Implemented pcre2_code_copy(), and added pushcopy and #popcopy to pcre2test
for testing it. for testing it.
16. Change 66 for 10.21 introduced the use of snprintf() in PCRE2's version of
regerror(). When the error buffer is too small, my version of snprintf() puts a
binary zero in the final byte. Bug #1801 seems to show that other versions do
not do this, leading to bad output from pcre2test when it was checking for
buffer overflow. It no longer assumes a binary zero at the end of a too-small
regerror() buffer.
Version 10.21 12-January-2016 Version 10.21 12-January-2016
----------------------------- -----------------------------
@ -443,7 +450,7 @@ space or a #-type comment that was followed by (?-x), which turns off
PCRE2_EXTENDED, and there was no subsequent (?x) to turn it on again, PCRE2_EXTENDED, and there was no subsequent (?x) to turn it on again,
pcre2_compile() assumed that (?-x) applied to the whole pattern and pcre2_compile() assumed that (?-x) applied to the whole pattern and
consequently mis-compiled it. This bug was found by the LLVM fuzzer. The fix consequently mis-compiled it. This bug was found by the LLVM fuzzer. The fix
for this bug means that a setting of any of the (?imsxU) options at the start for this bug means that a setting of any of the (?imsxJU) options at the start
of a pattern is no longer transferred to the options that are returned by of a pattern is no longer transferred to the options that are returned by
PCRE2_INFO_ALLOPTIONS. In fact, this was an anachronism that should have PCRE2_INFO_ALLOPTIONS. In fact, this was an anachronism that should have
changed when the effects of those options were all moved to compile time. changed when the effects of those options were all moved to compile time.

4
src/pcre2test.c
View File

@ -4769,6 +4769,7 @@ if ((pat_patctl.control & CTL_POSIX) != 0)
if (rc != 0) if (rc != 0)
{ {
size_t bsize, usize; size_t bsize, usize;
int psize;
preg.re_pcre2_code = NULL; /* In case something was left in there */ preg.re_pcre2_code = NULL; /* In case something was left in there */
preg.re_match_data = NULL; preg.re_match_data = NULL;
@ -4779,7 +4780,8 @@ if ((pat_patctl.control & CTL_POSIX) != 0)
memcpy(pbuffer8 + bsize, "DEADBEEF", 8); memcpy(pbuffer8 + bsize, "DEADBEEF", 8);
usize = regerror(rc, &preg, (char *)pbuffer8, bsize); usize = regerror(rc, &preg, (char *)pbuffer8, bsize);
fprintf(outfile, "Failed: POSIX code %d: %s\n", rc, pbuffer8); psize = (int)bsize;
fprintf(outfile, "Failed: POSIX code %d: %.*s\n", rc, psize, pbuffer8);
if (usize > bsize) if (usize > bsize)
{ {
fprintf(outfile, "** regerror() message truncated\n"); fprintf(outfile, "** regerror() message truncated\n");