diff options
| author | Anatol Belski <ab@php.net> | 2017-12-05 18:35:16 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-12-05 18:35:16 +0100 |
| commit | 9c8ffbf1af7fd19dd2f4fcc12244531e3e16d78d (patch) | |
| tree | f0b0f75e635bfd6adba84c7d228854e655951b89 /ext/pcre/php_pcre.c | |
| parent | 9cca85ff0760603dfa8ac58e1828f4c5ab3a5afe (diff) | |
| parent | d4af2046372dd33e2364c6862ada3a9333f75907 (diff) | |
| download | php-git-9c8ffbf1af7fd19dd2f4fcc12244531e3e16d78d.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
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 bcde23fe25..3b6f795a8c 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -90,7 +90,7 @@ ZEND_TLS uint8_t pcre2_init_ok = 0; #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 |