mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-10 04:54:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source 
* PHP-7.0:
  fix crash in phpdbg shutdown process when opcache is loaded
This commit is contained in:
Joe Watkins 2017-02-27 17:55:14 +00:00
commit 7aa59a4440
No known key found for this signature in database
GPG Key ID: F9BA0ADA31CBD89E
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sapi/phpdbg/phpdbg.c
View File

@ -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_METHOD]);
zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]); zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_COND]);
zend_hash_destroy(&PHPDBG_G(bp)[PHPDBG_BREAK_MAP]); 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(seek));
zend_hash_destroy(&PHPDBG_G(registered)); zend_hash_destroy(&PHPDBG_G(registered));
phpdbg_destroy_watchpoints(); phpdbg_destroy_watchpoints();
@ -2152,6 +2151,8 @@ phpdbg_out:
wrapper->wops->stream_opener = PHPDBG_G(orig_url_wrap_php); wrapper->wops->stream_opener = PHPDBG_G(orig_url_wrap_php);
} }
zend_hash_destroy(&PHPDBG_G(file_sources));
zend_try { zend_try {
php_module_shutdown(); php_module_shutdown();
} zend_end_try(); } zend_end_try();