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/fileinfo/libmagic | |
| parent | 7ad04a053756902dd87e46e188eb6db0e3ae4dfb (diff) | |
| download | php-git-275fa5356442d4b387cc3401aee276f5a3b452b0.tar.gz | |
Accept zend_string* instead of char* in php_pcre_match_impl()
Diffstat (limited to 'ext/fileinfo/libmagic')
| -rw-r--r-- | ext/fileinfo/libmagic/softmagic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/fileinfo/libmagic/softmagic.c b/ext/fileinfo/libmagic/softmagic.c index a270f97eca..75bde73811 100644 --- a/ext/fileinfo/libmagic/softmagic.c +++ b/ext/fileinfo/libmagic/softmagic.c @@ -2024,18 +2024,18 @@ magiccheck(struct magic_set *ms, struct magic *m) /* pce now contains the compiled regex */ zval retval; zval subpats; - char *haystack; + zend_string *haystack; ZVAL_NULL(&retval); ZVAL_NULL(&subpats); /* Cut the search len from haystack, equals to REG_STARTEND */ - haystack = estrndup(ms->search.s, ms->search.s_len); + haystack = zend_string_init(ms->search.s, ms->search.s_len, 0); /* match v = 0, no match v = 1 */ - php_pcre_match_impl(pce, haystack, ms->search.s_len, &retval, &subpats, 0, 1, PREG_OFFSET_CAPTURE, 0); + php_pcre_match_impl(pce, haystack, &retval, &subpats, 0, 1, PREG_OFFSET_CAPTURE, 0); /* Free haystack */ - efree(haystack); + zend_string_release(haystack); if (Z_LVAL(retval) < 0) { zval_ptr_dtor(&subpats); |