]> granicus.if.org Git - php/commitdiff
fix crash when .phpdbginit quits
authorkrakjoe <joe.watkins@live.co.uk>
Thu, 14 Nov 2013 17:03:36 +0000 (17:03 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Thu, 14 Nov 2013 17:03:36 +0000 (17:03 +0000)
phpdbg.c

index 7eabfe93d7c78938d90281aa0460bf73a01a76b2..443b603074e24b94675838caedef74c2fc6017d9 100644 (file)
--- 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);