From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 24 Nov 2013 11:45:05 +0000 (-0200)
Subject: - Moved conditional bp checking
X-Git-Tag: php-5.6.0alpha1~110^2~107
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46c899ba3024546ee4e3acacacfa9bd32d61a226;p=php

- Moved conditional bp checking
---

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index 1a0452deac..849b8def0d 100644
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -449,6 +449,13 @@ int phpdbg_find_conditional_breakpoint(TSRMLS_D) /* {{{ */
 
 int phpdbg_find_breakpoint(zend_execute_data* execute_data TSRMLS_DC) /* {{{ */
 {
+	/* conditions cannot be executed by eval()'d code */
+	if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL)
+		&& (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP)
+		&& phpdbg_find_conditional_breakpoint(TSRMLS_C) == SUCCESS) {
+		return SUCCESS;
+	}
+
 	if (PHPDBG_G(flags) & PHPDBG_HAS_FILE_BP
 		&& phpdbg_find_breakpoint_file(execute_data->op_array TSRMLS_CC) == SUCCESS) {
 		return SUCCESS;
diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 1eaaef7856..5c276ab8f8 100644
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -1369,13 +1369,6 @@ zend_vm_enter:
 		phpdbg_print_opline_ex(
 			execute_data, &vars, 0 TSRMLS_CC);
 
-		/* conditions cannot be executed by eval()'d code */
-		if (!(PHPDBG_G(flags) & PHPDBG_IN_EVAL)
-			&& (PHPDBG_G(flags) & PHPDBG_HAS_COND_BP)
-			&& phpdbg_find_conditional_breakpoint(TSRMLS_C) == SUCCESS) {
-			DO_INTERACTIVE();
-		}
-
 		if (PHPDBG_G(flags) & PHPDBG_BP_MASK
 			&& phpdbg_find_breakpoint(execute_data TSRMLS_CC) == SUCCESS) {
 			DO_INTERACTIVE();