Fix bug #71659

diff --git a/NEWS b/NEWS
index cbd51b626bee8d7c5f20ab3d6d8b878a0f94fe0e..dad8993e18bb89f7b1a18605298b4125b4c9ead0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,10 @@ PHP                                                                        NEWS
   . Fixed bug #47803, #69526 (Executing prepared statements is succesfull only
     for the first two statements). (einavitamar at gmail dot com, Anatol)
 
+- PCRE:
+  . Fixed bug #71659 (segmentation fault in pcre running twig tests).
+    (nish dot aravamudan at canonical dot com)
+
 - PDO_DBlib:
   . Bug #54648 (PDO::MSSQL forces format of datetime fields).
     (steven dot lambeth at gmx dot de, Anatol)

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 93bfc0005246e42d7de793b296894dc814913c76..a522109f3e005c431e8e124d09394c1981ec2a69 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1731,8 +1731,6 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, char *subject, int subjec
        zend_long limit_val, zend_long flags)
 {
        pcre_extra              *extra = pce->extra;/* Holds results of studying */
-       pcre                    *re_bump = NULL;        /* Regex instance for empty matches */
-       pcre_extra              *extra_bump = NULL;     /* Almost dummy */
        pcre_extra               extra_data;            /* Used locally for exec options */
        int                             *offsets;                       /* Array of subpattern offsets */
        int                              size_offsets;          /* Size of the offsets array */
@@ -1840,29 +1838,11 @@ PHPAPI void php_pcre_split_impl(pcre_cache_entry *pce, char *subject, int subjec
                           the start offset, and continue. Fudge the offset values
                           to achieve this, unless we're already at the end of the string. */
                        if (g_notempty != 0 && start_offset < subject_len) {
-                               if (pce->compile_options & PCRE_UTF8) {
-                                       if (re_bump == NULL) {
-                                               int dummy;
-                                               zend_string *regex = zend_string_init("/./us", sizeof("/./us")-1, 0);
-                                               re_bump = pcre_get_compiled_regex(regex, &extra_bump, &dummy);
-                                               zend_string_release(regex);
-                                               if (re_bump == NULL) {
-                                                       RETURN_FALSE;
-                                               }
-                                       }
-                                       count = pcre_exec(re_bump, extra_bump, subject,
-                                                         subject_len, start_offset,
-                                                         exoptions, offsets, size_offsets);
-                                       if (count < 1) {
-                                               php_error_docref(NULL, E_WARNING, "Unknown error");
-                                               RETURN_FALSE;
-                                       }
-                               } else {
-                                       offsets[0] = start_offset;
-                                       offsets[1] = start_offset + 1;
-                               }
-                       } else
+                               offsets[0] = start_offset;
+                               offsets[1] = start_offset + calculate_unit_length(pce, subject + start_offset);
+                       } else {
                                break;
+                       }
                } else {
                        pcre_handle_exec_error(count);
                        break;