diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-08-18 14:56:28 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-08-18 14:56:28 +0300 |
| commit | ef90e37bd15db5ecea57e03ad72a53acd844b706 (patch) | |
| tree | 855f8d9adfbc4933b5dac52aa51efe0116c74375 /ext/pcre/php_pcre.c | |
| parent | 6c3c88074c43ac869701bbb1d61e9fea2e7417f6 (diff) | |
| download | php-git-ef90e37bd15db5ecea57e03ad72a53acd844b706.tar.gz | |
Fixed bug #75089 (preg_grep() is not reporting PREG_BAD_UTF8_ERROR after first input string)
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 750e720d74..44b5ff55b0 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -2537,7 +2537,7 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return int *offsets; /* Array of subpattern offsets */ int size_offsets; /* Size of the offsets array */ int count = 0; /* Count of matched subpatterns */ - int no_utf_check = 0; /* Execution options */ + int no_utf_check; /* Execution options */ zend_string *string_key; zend_ulong num_key; zend_bool invert; /* Whether to return non-matching @@ -2569,18 +2569,13 @@ PHPAPI void php_pcre_grep_impl(pcre_cache_entry *pce, zval *input, zval *return PCRE_G(error_code) = PHP_PCRE_NO_ERROR; -#ifdef HAVE_PCRE_JIT_SUPPORT - if (!(pce->compile_options & PCRE_UTF8)) { - no_utf_check = PCRE_NO_UTF8_CHECK; - } -#endif - /* Go through the input array */ ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(input), num_key, string_key, entry) { zend_string *subject_str = zval_get_string(entry); /* Perform the match */ #ifdef HAVE_PCRE_JIT_SUPPORT + no_utf_check = (pce->compile_options & PCRE_UTF8) ? 0 : PCRE_NO_UTF8_CHECK; if ((extra->flags & PCRE_EXTRA_EXECUTABLE_JIT) && no_utf_check) { count = pcre_jit_exec(pce->re, extra, ZSTR_VAL(subject_str), |