com php-src: Fix yet one data race in PCRE: ext/pcre/php_pcre .c

From: Date: Wed, 06 Dec 2017 14:59:21 +0000
Subject: com php-src: Fix yet one data race in PCRE: ext/pcre/php_pcre .c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-100510@lists.php.net to get a copy of this message
Commit: 1b29dc0b1c4836085a17cbf2f59dae8aeb85424c Author: Anatol Belski <ab@php.net> Wed, 6 Dec 2017 15:59:21 +0100 Parents: 092fd44474676857359153c859e0cb300720d80a Branches: PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1b29dc0b1c4836085a17cbf2f59dae8aeb85424c Log: Fix yet one data race in PCRE PCRE 8.x initializes the pattern compiler on demand during the first pcre_study call. It could be worse, but since the compiled patterns are cached, the locking impact is minimal. PCRE 10.x always compiles the pattern and thread sanitizer doesn't complain about the compiler initialization, thus the newer PCRE version seems to be unafected. Changed paths: M ext/pcre/php_pcre.c Diff: diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index a743f30..bf8e02c 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -67,7 +67,7 @@ PHPAPI ZEND_DECLARE_MODULE_GLOBALS(pcre) #define PCRE_JIT_STACK_MAX_SIZE (64 * 1024) ZEND_TLS pcre_jit_stack *jit_stack = NULL; #endif -#if defined(ZTS) && defined(HAVE_PCRE_JIT_SUPPORT) +#if defined(ZTS) static MUTEX_T pcre_mt = NULL; #define php_pcre_mutex_alloc() if (!pcre_mt) pcre_mt = tsrm_mutex_alloc(); #define php_pcre_mutex_free() if (pcre_mt) tsrm_mutex_free(pcre_mt); pcre_mt = NULL; @@ -538,7 +538,9 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) /* If study option was specified, study the pattern and store the result in extra for passing to pcre_exec. */ if (do_study) { + php_pcre_mutex_lock(); extra = pcre_study(re, soptions, &error); + php_pcre_mutex_unlock(); if (extra) { extra->flags |= PCRE_EXTRA_MATCH_LIMIT | PCRE_EXTRA_MATCH_LIMIT_RECURSION; extra->match_limit = (unsigned long)PCRE_G(backtrack_limit);

« previous php.cvs (#100510) next »