diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-09-17 20:39:28 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-09-17 20:39:28 +0300 |
| commit | 62338a23852e3da56a0e6a56052835f390f608bd (patch) | |
| tree | 794deb77647fdf80ca20c1aa9a81d5b14f0badb9 /Zend/zend_execute_API.c | |
| parent | 1154f6f70a3e4ee083f1bc42d83c190ad68f3862 (diff) | |
| download | php-git-62338a23852e3da56a0e6a56052835f390f608bd.tar.gz | |
Use different loop terminating conditions
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 5b6012767c..12be858e15 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -321,7 +321,7 @@ void shutdown_executor(void) /* {{{ */ } else { ZEND_HASH_REVERSE_FOREACH_STR_KEY_VAL(EG(zend_constants), key, zv) { zend_constant *c = Z_PTR_P(zv); - if (ZEND_CONSTANT_FLAGS(c) & CONST_PERSISTENT) { + if (_idx == EG(persistent_constants_count)) { break; } zval_ptr_dtor_nogc(&c->value); @@ -333,7 +333,7 @@ void shutdown_executor(void) /* {{{ */ } ZEND_HASH_FOREACH_END_DEL(); ZEND_HASH_REVERSE_FOREACH_STR_KEY_VAL(EG(function_table), key, zv) { zend_function *func = Z_PTR_P(zv); - if (func->type == ZEND_INTERNAL_FUNCTION) { + if (_idx == EG(persistent_functions_count)) { break; } destroy_op_array(&func->op_array); @@ -341,7 +341,7 @@ void shutdown_executor(void) /* {{{ */ } ZEND_HASH_FOREACH_END_DEL(); ZEND_HASH_REVERSE_FOREACH_STR_KEY_VAL(EG(class_table), key, zv) { zend_class_entry *ce = Z_PTR_P(zv); - if (ce->type == ZEND_INTERNAL_CLASS) { + if (_idx == EG(persistent_classes_count)) { break; } destroy_zend_class(zv); |