diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-06-23 14:07:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-06-23 14:07:08 +0800 |
| commit | dad500ef6af6be3fe447185749534bb0e284d4f8 (patch) | |
| tree | c1fdf7bf55de2e18ac7834f57fc59aedc58670c0 /ext/pcre/php_pcre.c | |
| parent | 782caa7301226b2231f2e75b2ee3570a87cb6628 (diff) | |
| parent | bd74e7d0133493ee4290857ac368f5fbdd278084 (diff) | |
| download | php-git-dad500ef6af6be3fe447185749534bb0e284d4f8.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72476 (Memleak in jit_stack)
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 a08770bd88..dbb9c6abec 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -216,7 +216,7 @@ static PHP_MSHUTDOWN_FUNCTION(pcre) /* {{{ PHP_RINIT_FUNCTION(pcre) */ static PHP_RINIT_FUNCTION(pcre) { - if (PCRE_G(jit)) { + if (PCRE_G(jit) && jit_stack == NULL) { jit_stack = pcre_jit_stack_alloc(PCRE_JIT_STACK_MIN_SIZE,PCRE_JIT_STACK_MAX_SIZE); } |