Fixed bug #70868 (PCRE JIT and pattern reuse segfault)

diff --git a/NEWS b/NEWS
index b19123201ad402c580c21763efd910e493cdc91b..0985ae6dda4ba244fd2a593807ac8538dbaccd41 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ PHP                                                                        NEWS
     test suite). (Anatol)
 
 - SPL:
+  . Fixed bug #70868 (PCRE JIT and pattern reuse segfault). (Laruence)
   . Fixed bug #70853 (SplFixedArray throws exception when using ref variable
     as index). (Laruence)
 

diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
index cd0c624b508b3d5d6de95d3da72bfaf4fd9a2660..b29fc5298bc25861e43c1244266417a57134d954 100644 (file)
--- a/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@ -2059,6 +2059,11 @@ SPL_METHOD(RegexIterator, accept)
        {
                case REGIT_MODE_MAX: /* won't happen but makes compiler happy */
                case REGIT_MODE_MATCH:
+#ifdef PCRE_EXTRA_MARK
+                       if (intern->u.regex.pce->extra) {
+                               intern->u.regex.pce->extra->flags &= ~PCRE_EXTRA_MARK;
+                       }
+#endif
                        count = pcre_exec(intern->u.regex.pce->re, intern->u.regex.pce->extra, ZSTR_VAL(subject), ZSTR_LEN(subject), 0, 0, NULL, 0);
                        RETVAL_BOOL(count >= 0);
                        break;

diff --git a/Zend/tests/bug70868.phpt b/ext/spl/tests/bug70868.phpt
similarity index 100%
rename from Zend/tests/bug70868.phpt
rename to ext/spl/tests/bug70868.phpt