clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "libmagic: Move the allocation on the stack"

Browse Source 
This reverts commit 1d84a58736.

Signed-off-by: Anatol Belski <ab@php.net>
This commit is contained in:
Anatol Belski 2020-09-02 20:04:00 +02:00
parent f3f5719355
commit f2b40775af
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ext/fileinfo/libmagic/softmagic.c
View File

@ -479,12 +479,11 @@ check_fmt(struct magic_set *ms, const char *fmt)
pcre_cache_entry *pce;
int rv = -1;
zend_string *pattern;
ALLOCA_FLAG(use_heap)
if (strchr(fmt, '%') == NULL)
return 0;
ZSTR_ALLOCA_INIT(pattern, "~%[-0-9\\.]*s~", sizeof("~%[-0-9\\.]*s~") - 1, use_heap);
pattern = zend_string_init("~%[-0-9\\.]*s~", sizeof("~%[-0-9\\.]*s~") - 1, 0);
if ((pce = pcre_get_compiled_regex_cache_ex(pattern, 0)) == NULL) {
rv = -1;
} else {
@ -495,7 +494,7 @@ check_fmt(struct magic_set *ms, const char *fmt)
php_pcre_free_match_data(match_data);
}
}
ZSTR_ALLOCA_FREE(pattern, use_heap);
zend_string_release(pattern);
return rv;
}