diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-20 11:13:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-05-20 11:13:35 +0200 |
| commit | 1b1d313275c132dcfe03314933e4cdb996cea543 (patch) | |
| tree | 764564950ea48811f889b03b3a23547c7fc4e066 /Zend/zend_execute_API.c | |
| parent | 057875d161da6417e3e56209828d21fc54250127 (diff) | |
| parent | db0cdcbb0a224f958870125a13bd5901fa6e8a0f (diff) | |
| download | php-git-1b1d313275c132dcfe03314933e4cdb996cea543.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix static property indirections in file cache
Don't require rc=1 for function static variables
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 0a7a7e3b15..6986841db2 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -287,8 +287,7 @@ void shutdown_executor(void) /* {{{ */ if (op_array->static_variables) { HashTable *ht = ZEND_MAP_PTR_GET(op_array->static_variables_ptr); if (ht) { - ZEND_ASSERT(GC_REFCOUNT(ht) == 1); - zend_array_destroy(ht); + zend_array_release(ht); ZEND_MAP_PTR_SET(op_array->static_variables_ptr, NULL); } } |