match: also restore originally unset entries in recursion (#300)

A regresion from ~10.30 not affecting JIT
PCRE2Project · Oct 3, 2023 · 794245e · 794245e
1 parent 4a2bf0c
commit 794245e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/pcre2_match.c b/src/pcre2_match.c
@@ -5953,7 +5953,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode);
         {
         P = (heapframe *)((char *)N - frame_size);
         memcpy((char *)F + offsetof(heapframe, ovector), P->ovector,
-          P->offset_top * sizeof(PCRE2_SIZE));
+          Foffset_top * sizeof(PCRE2_SIZE));
         Foffset_top = P->offset_top;
         Fcapture_last = P->capture_last;
         Fcurrent_recurse = P->current_recurse;

diff --git a/testdata/testinput1 b/testdata/testinput1
@@ -4372,6 +4372,9 @@
 /^(?(DEFINE) (?<A> a) (?<B> b) )  (?&A) (?&B) /x
     abcd
 
+/(?<all>(?:(?:a(?&all))|(b))(c?))/
+    aabc
+
 /(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
   (?(DEFINE)
   (?<NAME_PAT>[a-z]+)

diff --git a/testdata/testoutput1 b/testdata/testoutput1
@@ -6948,6 +6948,13 @@ No match
     abcd
  0: ab
 
+/(?<all>(?:(?:a(?&all))|(b))(c?))/
+    aabc
+ 0: aabc
+ 1: aabc
+ 2: <unset>
+ 3: 
+
 /(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
   (?(DEFINE)
   (?<NAME_PAT>[a-z]+)