]> granicus.if.org Git - php/commitdiff
Fixed infinite loop when quitting (sometimes)
authorBob Weinand <bobwei9@hotmail.com>
Mon, 21 Apr 2014 21:14:06 +0000 (23:14 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 21 Apr 2014 21:14:06 +0000 (23:14 +0200)
phpdbg_prompt.c

index e2603a00ed328b5982677d10d061c512002e184c..7a28a75129fe962c6b646011d7c0b646d6d380d3 100644 (file)
@@ -920,7 +920,7 @@ PHPDBG_COMMAND(quit) /* {{{ */
                zend_bailout();
        }
 
-       return SUCCESS;
+       return PHPDBG_NEXT;
 } /* }}} */
 
 PHPDBG_COMMAND(clean) /* {{{ */
@@ -1048,7 +1048,7 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */
                                        case PHPDBG_FINISH:
                                        case PHPDBG_UNTIL:
                                        case PHPDBG_NEXT: {
-                                               if (!EG(in_execution)) {
+                                               if (!EG(in_execution) && !(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
                                                        phpdbg_error("Not running");
                                                }
                                                goto out;