diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2019-06-28 10:44:13 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2019-06-28 10:44:13 +0300 |
| commit | 696b9e25c8b233d1ab8208f33e5da608464bdda8 (patch) | |
| tree | 882c5c90be8bf27644901b7702f7bc60ca8722b9 /Zend | |
| parent | aa8d70f309825cb306afee3d618eaf45ebc2c738 (diff) | |
| parent | ba8033feb0c2e8c6665a55d13ae2d0957ce72add (diff) | |
| download | php-git-696b9e25c8b233d1ab8208f33e5da608464bdda8.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed use-after-free
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_execute_API.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index b5460dc51a..75aaa0137f 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -357,6 +357,7 @@ void shutdown_executor(void) /* {{{ */ if (ht) { ZEND_ASSERT(GC_REFCOUNT(ht) == 1); zend_array_destroy(ht); + ZEND_MAP_PTR_SET(op_array->static_variables_ptr, NULL); } } } ZEND_HASH_FOREACH_END(); @@ -388,6 +389,7 @@ void shutdown_executor(void) /* {{{ */ if (ht) { ZEND_ASSERT(GC_REFCOUNT(ht) == 1); zend_array_destroy(ht); + ZEND_MAP_PTR_SET(op_array->static_variables_ptr, NULL); } } } |