Fix open parens in MAKE/SKIP/PRUNE/THEN name bug.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1305 2f5784b3-3f2a-0410-8824-cb99058d5e15

4 files changed, 39 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index dc43cd1..b273e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,6 +127,9 @@ Version 8.33 xx-xxxx-201x
 
 32. Control verbs are handled in the same way in JIT and interpreter.
 
+33. An opening parenthesis in a MARK/PRUNE/SKIP/THEN name in a pattern that
+    contained a forward subroutine reference caused a compile error.
+
 
 Version 8.32 30-November-2012
 -----------------------------
diff --git a/pcre_compile.c b/pcre_compile.c
index 4f17ba1..110df2a 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -1409,7 +1409,11 @@ if (ptr[0] == CHAR_LEFT_PARENTHESIS)
   {
   /* Handle specials such as (*SKIP) or (*UTF8) etc. */
 
-  if (ptr[1] == CHAR_ASTERISK) ptr += 2;
+  if (ptr[1] == CHAR_ASTERISK) 
+    {
+    ptr += 2;
+    while (ptr < cd->end_pattern && *ptr != CHAR_RIGHT_PARENTHESIS) ptr++;
+    } 
 
   /* Handle a normal, unnamed capturing parenthesis. */
 
@@ -2130,9 +2134,6 @@ for (;;)
       case OP_MARK:
       case OP_PRUNE_ARG:
       case OP_SKIP_ARG:
-      code += code[1];
-      break;
-
       case OP_THEN_ARG:
       code += code[1];
       break;
@@ -2250,9 +2251,6 @@ for (;;)
       case OP_MARK:
       case OP_PRUNE_ARG:
       case OP_SKIP_ARG:
-      code += code[1];
-      break;
-
       case OP_THEN_ARG:
       code += code[1];
       break;
@@ -2617,9 +2615,6 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
     case OP_MARK:
     case OP_PRUNE_ARG:
     case OP_SKIP_ARG:
-    code += code[1];
-    break;
-
     case OP_THEN_ARG:
     code += code[1];
     break;
diff --git a/testdata/testinput1 b/testdata/testinput1
index 232a45e..6319a25 100644
--- a/testdata/testinput1
+++ b/testdata/testinput1
@@ -5576,4 +5576,16 @@ AbcdCBefgBhiBqz
 /^(A(*THEN)B|C(*THEN)D)/
     CD           
 
+/(*:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+
+/(*PRUNE:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+
+/(*SKIP:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+
+/(*THEN:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+
 /-- End of testinput1 --/
diff --git a/testdata/testoutput1 b/testdata/testoutput1
index 39e9e59..c07816b 100644
--- a/testdata/testoutput1
+++ b/testdata/testoutput1
@@ -9153,4 +9153,23 @@ No match
  0: CD
  1: CD
 
+/(*:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+MK: m(m
+
+/(*PRUNE:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+MK: m(m
+
+/(*SKIP:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+
+/(*THEN:m(m)(?&y)(?(DEFINE)(?<y>b))/K
+    abc
+ 0: b
+MK: m(m
+
 /-- End of testinput1 --/