From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 13 Nov 2013 21:27:24 +0000 (-0200)
Subject: - Added check for file context on "break lineno" and name length on "break func"
X-Git-Tag: php-5.6.0alpha1~110^2~356
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cc067aa81cc42c1b90d62be0019de8ecabcd894;p=php

- Added check for file context on "break lineno" and name length on "break func"
---

diff --git a/phpdbg_break.c b/phpdbg_break.c
index 920350f7a7..b2461dc2ae 100644
--- a/phpdbg_break.c
+++ b/phpdbg_break.c
@@ -112,24 +112,28 @@ PHPDBG_BREAK(on) /* {{{ */
 
 PHPDBG_BREAK(lineno) /* {{{ */
 {
-    /* note: this can break on [no active file] */
-    if (expr && expr_len > 0L) {
-	   if (phpdbg_is_numeric(expr)) {
-	        const char *filename = zend_get_executed_filename(TSRMLS_C);
-
-		    if (filename) {
-		        phpdbg_set_breakpoint_file(
-		            filename, strtol(expr, NULL, 0) TSRMLS_CC);
-		    } else {
-		        phpdbg_error("No file context found");
-		    }
-	   } else {
-	      phpdbg_error(
-	        "The expression provided is not a valid line number %s", expr);
-	   }
+	if (!PHPDBG_G(exec)) {
+		phpdbg_error("Not file context found!");
+		return SUCCESS;
+	}
+
+	if (expr_len == 0) {
+	    phpdbg_error("No expression provided!");
+	    return SUCCESS;
+	}
+
+	if (phpdbg_is_numeric(expr)) {
+		const char *filename = zend_get_executed_filename(TSRMLS_C);
+
+		if (filename &&
+			!memcmp(filename, "[no active file]", sizeof("[no active file]"))) {
+			phpdbg_set_breakpoint_file(filename, strtol(expr, NULL, 0) TSRMLS_CC);
+		} else {
+			phpdbg_error("No file context found");
+		}
 	} else {
-	    phpdbg_error(
-	        "No expression provided!");
+		phpdbg_error(
+			"The expression provided is not a valid line number %s", expr);
 	}
 
 	return SUCCESS;
@@ -137,17 +141,23 @@ PHPDBG_BREAK(lineno) /* {{{ */
 
 PHPDBG_BREAK(func) /* {{{ */
 {
-    if (expr && expr_len > 0L) {
-        char name[200];
-        size_t name_len = expr_len;
+	char name[200];
+	size_t name_len = expr_len;
 
-	    name_len = MIN(name_len, 200);
-	    memcpy(name, expr, name_len);
-	    name[name_len] = 0;
+	if (expr_len == 0) {
+		phpdbg_error("No expression provided");
+		return SUCCESS;
+	}
+
+	if (expr_len >= 200) {
+		phpdbg_error("Name is too long");
+		return SUCCESS;
+	}
+
+	memcpy(name, expr, name_len);
+	name[name_len] = 0;
+
+	phpdbg_set_breakpoint_symbol(name TSRMLS_CC);
 
-	    phpdbg_set_breakpoint_symbol(name TSRMLS_CC);
-    } else {
-        phpdbg_error("No expression provided");
-    }
     return SUCCESS;
 } /* }}} */