From: krakjoe <joe.watkins@live.co.uk>
Date: Thu, 14 Nov 2013 17:03:36 +0000 (+0000)
Subject: fix crash when .phpdbginit quits
X-Git-Tag: php-5.6.0alpha1~110^2~327
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b864a8b0fb72a80de3cb7e2ea8d8a3d7647c765;p=php

fix crash when .phpdbginit quits
---

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);