From 6b864a8b0fb72a80de3cb7e2ea8d8a3d7647c765 Mon Sep 17 00:00:00 2001 From: krakjoe Date: Thu, 14 Nov 2013 17:03:36 +0000 Subject: [PATCH] fix crash when .phpdbginit quits --- phpdbg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/phpdbg.c b/phpdbg.c index 7eabfe93d7..443b603074 100644 --- a/phpdbg.c +++ b/phpdbg.c @@ -494,7 +494,13 @@ phpdbg_main: } zend_end_try(); /* initialize from file */ - phpdbg_init(init_file, init_file_len, init_file_default TSRMLS_CC); + zend_try { + phpdbg_init(init_file, init_file_len, init_file_default TSRMLS_CC); + } zend_catch { + if (PHPDBG_G(flags) & PHPDBG_IS_QUITTING) { + goto phpdbg_out; + } + } zend_end_try(); /* print blurb */ phpdbg_welcome(cleaning TSRMLS_CC); -- 2.50.1