summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorandrewnester <andrew.nester.dev@gmail.com>2017-01-24 16:38:30 +0300
committerJoe Watkins <krakjoe@php.net>2017-01-26 09:03:47 +0000
commitf65ae82c55b986fbc1e140de998b4a9c44911cac (patch)
tree69b1ed421fdf796e75b46449760a3890b0b706f8 /Zend/zend_execute_API.c
parenta15c1990ebf0dc7929511482ef9b59bad903b0bc (diff)
downloadphp-git-f65ae82c55b986fbc1e140de998b4a9c44911cac.tar.gz
Fixed #73973 - debug_zval_dump() assertion error for resource consts with --enable-debug
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 51baac2250..28a75b7190 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -344,6 +344,10 @@ void shutdown_executor(void) /* {{{ */
} zend_end_try();
zend_try {
+ clean_non_persistent_constants();
+ } zend_end_try();
+
+ zend_try {
zend_close_rsrc_list(&EG(regular_list));
} zend_end_try();
@@ -375,10 +379,6 @@ void shutdown_executor(void) /* {{{ */
} zend_end_try();
zend_try {
- clean_non_persistent_constants();
- } zend_end_try();
-
- zend_try {
#if 0&&ZEND_DEBUG
signal(SIGSEGV, original_sigsegv_handler);
#endif