Revert "fix crash in phpdbg shutdown process when opcache is loaded"
authorJoe Watkins <krakjoe@php.net>
Mon, 27 Feb 2017 19:21:10 +0000 (19:21 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 27 Feb 2017 19:21:10 +0000 (19:21 +0000)
This reverts commit 008fb28eafa3740b1e3696b1a5cf7566d493b97d.

sapi/phpdbg/phpdbg.c

index 37314e6183499cd90ff6faeb5a156ad072cb9a9c..c4078856d636a01fa627d99da4d738990bf88f85 100644 (file)
@@ -228,6 +228,7 @@ static PHP_RSHUTDOWN_FUNCTION(phpdbg) /* {{{ */
        zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_METHOD]);
        zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]);
        zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_MAP]);
+       zend_hash_destroy(&PHPDBG_G(file_sources));
        zend_hash_destroy(&PHPDBG_G(seek));
        zend_hash_destroy(&PHPDBG_G(registered));
        zend_hash_destroy(&PHPDBG_G(watchpoints));
@@ -2136,8 +2137,6 @@ phpdbg_out:
                        wrapper->wops->stream_opener = PHPDBG_G(orig_url_wrap_php);
                }
 
-               zend_hash_destroy(&PHPDBG_G(file_sources));
-
                zend_try {
                        php_module_shutdown();
                } zend_end_try();