diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-02-27 17:55:31 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-02-27 17:55:31 +0000 |
| commit | 61ecad0f536377edc0c317767a3b2fef64509959 (patch) | |
| tree | 8b78d6119e5315a347c2685de03b301aefb1ca0a /sapi/phpdbg/phpdbg.c | |
| parent | b806287e43bd6be76051852edeeecb2e9140815b (diff) | |
| parent | 7aa59a444039908c0d42371fa4eaffb4089decbf (diff) | |
| download | php-git-61ecad0f536377edc0c317767a3b2fef64509959.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
fix crash in phpdbg shutdown process when opcache is loaded
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -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 1a796f1b0c..b45ef3f684 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(); |