diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-12-28 16:31:40 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-12-28 16:31:40 +0800 |
| commit | 7dffc6e3019f54e74eed3e7ec13d649f002b8d66 (patch) | |
| tree | d15480a092b43fe62de7adadaa75b454a2e013b5 /Zend/zend_execute_API.c | |
| parent | 2b9cc5238ee3c27d11215786a41bab5669d0eb10 (diff) | |
| parent | 650264e360e7cda8b224283dde55673ed022314d (diff) | |
| download | php-git-7dffc6e3019f54e74eed3e7ec13d649f002b8d66.tar.gz | |
Merge branch 'PHP-7.2'
* PHP-7.2:
Fixed bug #75742 (potential memleak in internal classes's static members)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index b651a08606..d0dadd5b22 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -296,6 +296,8 @@ void shutdown_executor(void) /* {{{ */ break; } } ZEND_HASH_FOREACH_END_DEL(); + + zend_cleanup_internal_classes(); } else { zend_hash_graceful_reverse_destroy(&EG(symbol_table)); @@ -358,6 +360,8 @@ void shutdown_executor(void) /* {{{ */ } ZEND_HASH_FOREACH_END_DEL(); } + zend_cleanup_internal_classes(); + while (EG(symtable_cache_ptr)>=EG(symtable_cache)) { zend_hash_destroy(*EG(symtable_cache_ptr)); FREE_HASHTABLE(*EG(symtable_cache_ptr)); @@ -388,8 +392,6 @@ void shutdown_executor(void) /* {{{ */ EG(ht_iterators_used) = 0; - zend_cleanup_internal_classes(); - zend_shutdown_fpu(); } /* }}} */ |