From: Anatol Belski <ab@php.net>
Date: Tue, 14 Nov 2017 09:14:09 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~1041
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0618d7d2ee9a4c04a009ed12145794691cf7b362;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix uninitialized flag when JIT is disabled
---

0618d7d2ee9a4c04a009ed12145794691cf7b362
diff --cc ext/pcre/php_pcre.c
index ed314622cc,c71335fe26..985d2c5aef
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@@ -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