102 lines
3.1 KiB
Diff
102 lines
3.1 KiB
Diff
From b3db1b7de5cfaa026ec2bc4a393129461a0f5c57 Mon Sep 17 00:00:00 2001
|
|
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
|
Date: Sat, 27 Feb 2016 18:44:41 +0000
|
|
Subject: [PATCH] Fix non-diagnosis of missing assertion after (?(?C).
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1638 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
|
|
|
Petr Písař: Ported to 8.38.
|
|
|
|
diff --git a/pcre_compile.c b/pcre_compile.c
|
|
index 4ffea0c..254c629 100644
|
|
--- a/pcre_compile.c
|
|
+++ b/pcre_compile.c
|
|
@@ -485,7 +485,7 @@ static const char error_texts[] =
|
|
"lookbehind assertion is not fixed length\0"
|
|
"malformed number or name after (?(\0"
|
|
"conditional group contains more than two branches\0"
|
|
- "assertion expected after (?(\0"
|
|
+ "assertion expected after (?( or (?(?C)\0"
|
|
"(?R or (?[+-]digits must be followed by )\0"
|
|
/* 30 */
|
|
"unknown POSIX class name\0"
|
|
@@ -6771,6 +6771,15 @@ for (;; ptr++)
|
|
for (i = 3;; i++) if (!IS_DIGIT(ptr[i])) break;
|
|
if (ptr[i] == CHAR_RIGHT_PARENTHESIS)
|
|
tempptr += i + 1;
|
|
+
|
|
+ /* tempptr should now be pointing to the opening parenthesis of the
|
|
+ assertion condition. */
|
|
+
|
|
+ if (*tempptr != CHAR_LEFT_PARENTHESIS)
|
|
+ {
|
|
+ *errorcodeptr = ERR28;
|
|
+ goto FAILED;
|
|
+ }
|
|
}
|
|
|
|
/* For conditions that are assertions, check the syntax, and then exit
|
|
diff --git a/testdata/testinput2 b/testdata/testinput2
|
|
index c805f5f..75e402e 100644
|
|
--- a/testdata/testinput2
|
|
+++ b/testdata/testinput2
|
|
@@ -4241,4 +4241,6 @@ backtracking verbs. --/
|
|
|
|
/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/
|
|
|
|
+/\N(?(?C)0?!.)*/
|
|
+
|
|
/-- End of testinput2 --/
|
|
diff --git a/testdata/testoutput2 b/testdata/testoutput2
|
|
index 800a72f..5e88d1a 100644
|
|
--- a/testdata/testoutput2
|
|
+++ b/testdata/testoutput2
|
|
@@ -555,13 +555,13 @@ Failed: malformed number or name after (?( at offset 4
|
|
Failed: malformed number or name after (?( at offset 4
|
|
|
|
/(?(?i))/
|
|
-Failed: assertion expected after (?( at offset 3
|
|
+Failed: assertion expected after (?( or (?(?C) at offset 3
|
|
|
|
/(?(abc))/
|
|
Failed: reference to non-existent subpattern at offset 7
|
|
|
|
/(?(?<ab))/
|
|
-Failed: assertion expected after (?( at offset 3
|
|
+Failed: assertion expected after (?( or (?(?C) at offset 3
|
|
|
|
/((?s)blah)\s+\1/I
|
|
Capturing subpattern count = 1
|
|
@@ -7870,7 +7870,7 @@ No match
|
|
Failed: malformed number or name after (?( at offset 6
|
|
|
|
/(?(''))/
|
|
-Failed: assertion expected after (?( at offset 4
|
|
+Failed: assertion expected after (?( or (?(?C) at offset 4
|
|
|
|
/(?('R')stuff)/
|
|
Failed: reference to non-existent subpattern at offset 7
|
|
@@ -14346,7 +14346,7 @@ No match
|
|
"((?2)+)((?1))"
|
|
|
|
"(?(?<E>.*!.*)?)"
|
|
-Failed: assertion expected after (?( at offset 3
|
|
+Failed: assertion expected after (?( or (?(?C) at offset 3
|
|
|
|
"X((?2)()*+){2}+"BZ
|
|
------------------------------------------------------------------
|
|
@@ -14667,4 +14667,7 @@ No match
|
|
|
|
/((?J)(?'R'(?'R'(?'R'(?'R'(?'R'(?|(\k'R'))))))))/
|
|
|
|
+/\N(?(?C)0?!.)*/
|
|
+Failed: assertion expected after (?( or (?(?C) at offset 4
|
|
+
|
|
/-- End of testinput2 --/
|
|
--
|
|
2.5.0
|
|
|