]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorAnatol Belski <ab@php.net>
Tue, 14 Nov 2017 09:14:09 +0000 (10:14 +0100)
committerAnatol Belski <ab@php.net>
Tue, 14 Nov 2017 09:14:09 +0000 (10:14 +0100)
* PHP-7.2:
  Fix uninitialized flag when JIT is disabled

1  2 
ext/pcre/php_pcre.c

index ed314622cc3243d82a76911213a1a41ceaabba9d,c71335fe263b97abfc0f679d4d39ff8032093e1d..985d2c5aef0910df429ba433f5c67ddc7b40d115
@@@ -2691,10 -2531,13 +2691,10 @@@ static PHP_FUNCTION(preg_grep
  
  PHPAPI void  php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return_value, zend_long flags) /* {{{ */
  {
 -      zval                *entry;                             /* An entry in the input array */
 -      pcre_extra              *extra = pce->extra;/* Holds results of studying */
 -      pcre_extra               extra_data;            /* Used locally for exec options */
 -      int                             *offsets;                       /* Array of subpattern offsets */
 -      int                              size_offsets;          /* Size of the offsets array */
 +      zval            *entry;             /* An entry in the input array */
 +      uint32_t                 num_subpats;           /* Number of captured subpatterns */
        int                              count = 0;                     /* Count of matched subpatterns */
-       uint32_t                 no_utf_check;          /* Execution options */
 -      int                              no_utf_check = 0;              /* Execution options */
++      uint32_t                 no_utf_check = 0;      /* Execution options */
        zend_string             *string_key;
        zend_ulong               num_key;
        zend_bool                invert;                        /* Whether to return non-matching