diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-02-27 17:55:14 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-02-27 17:55:14 +0000 |
| commit | 7aa59a444039908c0d42371fa4eaffb4089decbf (patch) | |
| tree | 80418eaba214e1d6c29021f3146f648d8130396c | |
| parent | 59acca2062d00f187f5066306f07e60ee3e87824 (diff) | |
| parent | 008fb28eafa3740b1e3696b1a5cf7566d493b97d (diff) | |
| download | php-git-7aa59a444039908c0d42371fa4eaffb4089decbf.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix crash in phpdbg shutdown process when opcache is loaded
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 320c8afac6..121f1edb17 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -231,7 +231,6 @@ static PHP_MSHUTDOWN_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)); phpdbg_destroy_watchpoints(); @@ -2152,6 +2151,8 @@ 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(); |