Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1:
  Fix phpGH-11374: Different preg_match result with -d pcre.jit=0

Author: nielsdos

NEWS

@@ -29,6 +29,10 @@ PHP                                                                        NEWS
   . Fixed bug GH-12489 (Missing sigbio creation checking in openssl_cms_verify).
     (Jakub Zelenka)
 
+- PCRE:
+  . Fixed bug GH-11374 (Backport upstream fix, Different preg_match result
+    with -d pcre.jit=0). (mvorisek)
+
 - SOAP:
   . Fixed bug GH-12392 (Segmentation fault on SoapClient::__getTypes).
     (nielsdos)

ext/pcre/pcre2lib/pcre2_match.c

@@ -5833,7 +5833,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;

ext/pcre/tests/gh11374.phpt

@@ -0,0 +1,60 @@
+--TEST--
+GH-11374 (PCRE regular expression without JIT enabled gives different result)
+--FILE--
+<?php
+
+$regex = '
+    (?<types>
+        (?:
+            (?:\{ (?&types) \})
+            | (a)
+        )
+        (\*?)
+    )
+';
+
+ini_set('pcre.jit', '0');
+$res = preg_match('{^' . $regex . '$}x', '{a}', $matches, PREG_OFFSET_CAPTURE);
+ini_set('pcre.jit', '1');
+// regex must be different to prevent regex cache, so just add 2nd "x" modifier
+$res2 = preg_match('{^' . $regex . '$}xx', '{a}', $matches2, PREG_OFFSET_CAPTURE);
+
+var_dump($matches === $matches2);
+print_r($matches);
+
+?>
+--EXPECT--
+bool(true)
+Array
+(
+    [0] => Array
+        (
+            [0] => {a}
+            [1] => 0
+        )
+
+    [types] => Array
+        (
+            [0] => {a}
+            [1] => 0
+        )
+
+    [1] => Array
+        (
+            [0] => {a}
+            [1] => 0
+        )
+
+    [2] => Array
+        (
+            [0] => 
+            [1] => -1
+        )
+
+    [3] => Array
+        (
+            [0] => 
+            [1] => 3
+        )
+
+)