From: krakjoe <joe.watkins@live.co.uk>
Date: Wed, 13 Nov 2013 01:44:59 +0000 (+0000)
Subject: fix segfault on set break opline address
X-Git-Tag: php-5.6.0alpha1~110^2~402
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0781e7b86389d88bbbc28e4dfa21344cc02ae679;p=php

fix segfault on set break opline address
---

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index b4defa1e70..988898f22e 100644
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -143,7 +143,7 @@ void phpdbg_set_breakpoint_opline(zend_ulong opline TSRMLS_DC) /* {{{ */
 
 		zend_hash_index_update(&PHPDBG_G(bp)[PHPDBG_BREAK_OPLINE], opline, &new_break, sizeof(phpdbg_breakline_t), NULL);
 
-	    phpdbg_notice("Breakpoint #%d added at %#lx%s",
+	    phpdbg_notice("Breakpoint #%d added at %#lx",
 			new_break.id, new_break.opline);
 	} else {
 	    phpdbg_notice("Breakpoint exists at %#lx", opline);
diff --git a/phpdbg_print.c b/phpdbg_print.c
index f5cbbd3eec..2c4c7ab5bf 100644
--- a/phpdbg_print.c
+++ b/phpdbg_print.c
@@ -90,7 +90,7 @@ PHPDBG_PRINT(class) /* {{{ */
 	                    
 	                    default: {
 	                        phpdbg_writeln(
-	                            "\tInternal Method %s::%s()", (*ce)->name, method->common.function_name);
+	                            "\tInternal %s::%s()", (*ce)->name, method->common.function_name);
 	                    }
 	                 }
 	            }
diff --git a/phpdbg_utils.c b/phpdbg_utils.c
index 3c8606cc22..fb2253528b 100644
--- a/phpdbg_utils.c
+++ b/phpdbg_utils.c
@@ -74,11 +74,13 @@ int phpdbg_is_class_method(const char *str, size_t len, char **class, char **met
 void phpdbg_print(int type TSRMLS_DC, const char *format, ...) /* {{{ */
 {
 	char *buffer = NULL;
-	va_list args;
+	va_list args = {0};
 
-	va_start(args, format);
-	vspprintf(&buffer, 0, format, args);
-	va_end(args);
+	if (format != NULL && strlen(format) > 0L) {
+	    va_start(args, format);
+	    vspprintf(&buffer, 0, format, args);
+	    va_end(args);
+	}
 
     /* TODO(anyone) colours */