diff options
| author | Anatol Belski <ab@php.net> | 2017-12-05 18:34:39 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-12-05 18:34:39 +0100 |
| commit | d4af2046372dd33e2364c6862ada3a9333f75907 (patch) | |
| tree | 2f04813989b057ab3c6adbdf24de6ec5889359bb /ext/pcre/php_pcre.c | |
| parent | 75a2ee7f7bad4d3bc7bc60c181eabcc6d58c7937 (diff) | |
| parent | 092fd44474676857359153c859e0cb300720d80a (diff) | |
| download | php-git-d4af2046372dd33e2364c6862ada3a9333f75907.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix use after free revealed by phpdbg
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 64db5da0f6..5ec7f4d902 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -71,7 +71,7 @@ ZEND_TLS pcre_jit_stack *jit_stack = NULL; #if defined(ZTS) && defined(HAVE_PCRE_JIT_SUPPORT) static MUTEX_T pcre_mt = NULL; #define php_pcre_mutex_alloc() if (tsrm_is_main_thread() && !pcre_mt) pcre_mt = tsrm_mutex_alloc(); -#define php_pcre_mutex_free() if (tsrm_is_main_thread() && pcre_mt) tsrm_mutex_free(pcre_mt); +#define php_pcre_mutex_free() if (tsrm_is_main_thread() && pcre_mt) tsrm_mutex_free(pcre_mt); pcre_mt = NULL; #define php_pcre_mutex_lock() tsrm_mutex_lock(pcre_mt); #define php_pcre_mutex_unlock() tsrm_mutex_unlock(pcre_mt); #else |