From: krakjoe <joe.watkins@live.co.uk>
Date: Sun, 10 Nov 2013 21:29:14 +0000 (+0000)
Subject: ...
X-Git-Tag: php-5.6.0alpha1~110^2~506
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=493e81e4c70e28e440544df372536c5171089fff;p=php

...
---

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 7671b2234b..684e88c64b 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -390,10 +390,10 @@ zend_vm_enter:
 			}
 		}
 
-        if (PHPDBG_G(has_sym_bp)) {
+        if (PHPDBG_G(has_sym_bp) && execute_data->opline->opcode != ZEND_RETURN) {
             zend_execute_data *previous = execute_data->prev_execute_data;
             if (previous && (previous != execute_data)) {
-                if (previous->opline && execute_data->opline->opcode != ZEND_RETURN) {
+                if (previous->opline) {
                     if (previous->opline->opcode == ZEND_DO_FCALL || previous->opline->opcode == ZEND_DO_FCALL_BY_NAME) {
                         if (phpdbg_find_breakpoint_symbol(previous->function_state.function TSRMLS_CC) == SUCCESS) {
                             while (phpdbg_interactive(0, NULL TSRMLS_CC) != PHPDBG_NEXT) {