From 50aa69657e752e89c887564096b55137509b7d58 Mon Sep 17 00:00:00 2001 From: "Philip.Hazel" Date: Mon, 2 Jul 2018 12:26:04 +0000 Subject: [PATCH] Fix bug in VERSION number reading. --- ChangeLog | 3 +++ src/pcre2_compile.c | 5 ++--- testdata/testinput2 | 3 +++ testdata/testoutput2 | 6 +++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e497ea..cf87b2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -104,6 +104,9 @@ complicated algorithm has now been implemented. 22. When checking to see if a lookbehind is of fixed length, lookaheads were correctly ignored, but qualifiers on lookaheads were not being ignored, leading to an incorrect "lookbehind assertion is not fixed length" error. + +23. The VERSION condition test was reading fractional PCRE2 version numbers +such as the 04 in 10.04 incorrectly and hence giving wrong results. Version 10.31 12-February-2018 diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c index 5a47f1d..1208012 100644 --- a/src/pcre2_compile.c +++ b/src/pcre2_compile.c @@ -3896,9 +3896,8 @@ while (ptr < ptrend) if (*ptr == CHAR_DOT) { if (++ptr >= ptrend || !IS_DIGIT(*ptr)) goto BAD_VERSION_CONDITION; - if (!read_number(&ptr, ptrend, -1, 99 , ERR79, &minor, &errorcode)) - goto FAILED; - if (minor < 10) minor *= 10; + minor = (*ptr++ - CHAR_0) * 10; + if (IS_DIGIT(*ptr)) minor += *ptr++ - CHAR_0; if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS) goto BAD_VERSION_CONDITION; } diff --git a/testdata/testinput2 b/testdata/testinput2 index cc4b59b..9b207ef 100644 --- a/testdata/testinput2 +++ b/testdata/testinput2 @@ -4007,6 +4007,9 @@ /(?(VERSION>=10.0)yes|no)/I yesno +/(?(VERSION>=10.04)yes|no)/ + yesno + /(?(VERSION=8)yes){3}/BI,aftertext yesno diff --git a/testdata/testoutput2 b/testdata/testoutput2 index aab0c94..124a8b6 100644 --- a/testdata/testoutput2 +++ b/testdata/testoutput2 @@ -13483,6 +13483,10 @@ Subject length lower bound = 2 yesno 0: yes +/(?(VERSION>=10.04)yes|no)/ + yesno + 0: yes + /(?(VERSION=8)yes){3}/BI,aftertext ------------------------------------------------------------------ Bra @@ -13537,7 +13541,7 @@ Failed: error 179 at offset 11: syntax error or number too big in (?(VERSION con Failed: error 179 at offset 16: syntax error or number too big in (?(VERSION condition /(?(VERSION=10.101)yes|no)/ -Failed: error 179 at offset 17: syntax error or number too big in (?(VERSION condition +Failed: error 179 at offset 16: syntax error or number too big in (?(VERSION condition /abcd/I Capturing subpattern count = 0