diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-18 12:25:10 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-03-18 12:32:06 +0100 |
| commit | 275fa5356442d4b387cc3401aee276f5a3b452b0 (patch) | |
| tree | da724aaae84ca10a12c11d0fae06fdc8d58c0b8a /ext/pcre/php_pcre.c | |
| parent | 7ad04a053756902dd87e46e188eb6db0e3ae4dfb (diff) | |
| download | php-git-275fa5356442d4b387cc3401aee276f5a3b452b0.tar.gz | |
Accept zend_string* instead of char* in php_pcre_match_impl()
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 35c9956fdb..d18ab6ae32 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -981,14 +981,14 @@ static void php_do_pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global) /* {{{ * } pce->refcount++; - php_pcre_match_impl(pce, ZSTR_VAL(subject), ZSTR_LEN(subject), return_value, subpats, + php_pcre_match_impl(pce, subject, return_value, subpats, global, ZEND_NUM_ARGS() >= 4, flags, start_offset); pce->refcount--; } /* }}} */ /* {{{ php_pcre_match_impl() */ -PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, size_t subject_len, zval *return_value, +PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, zend_string *subject_str, zval *return_value, zval *subpats, int global, int use_flags, zend_long flags, zend_off_t start_offset) { zval result_set, /* Holds a set of subpatterns after @@ -1010,6 +1010,9 @@ PHPAPI void php_pcre_match_impl(pcre_cache_entry *pce, char *subject, size_t sub pcre2_match_data *match_data; PCRE2_SIZE start_offset2; + char *subject = ZSTR_VAL(subject_str); + size_t subject_len = ZSTR_LEN(subject_str); + ZVAL_UNDEF(&marks); /* Overwrite the passed-in value for subpatterns with an empty array. */ |