Merge branch 'xdebug_2_2'

xdebug · May 19, 2013 · 5c68b09 · 5c68b09
2 parents 472878a + 8038ea8
commit 5c68b09
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 6 deletions.
diff --git a/tests/bug00931.phpt b/tests/bug00931.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test for bug #931: Crash with exception in shut-down stage
+--SKIPIF--
+<?php if (!version_compare(phpversion(), "5.3", '>=')) echo "skip >= PHP 5.3 needed\n"; ?>
+--FILE--
+<?php
+session_start();
+$_SESSION['test'] = function() { };
+echo "DONE";
+?>
+--EXPECT--
+DONE
+Fatal error: Uncaught exception 'Exception' with message 'Serialization of 'Closure' is not allowed' in [no active file]:0
+Stack trace:
+#0 {main}
+  thrown in [no active file] on line 0
diff --git a/tests/bug00947-1.phpt b/tests/bug00947-1.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test for bug #947: Newlines converted when html_errors = 0 (ansi)
+--INI--
+html_errors=0
+xdebug.overload_var_dump=1
+xdebug.cli_color=2
+xdebug.default_enable=1
+--FILE--
+<?php
+$t = "\0" . 'aze
+rty\r\nqwerty';
+var_dump($t, 4.34);
+?>
+--EXPECT--
+[1mstring[22m([32m18[0m) "[31m\000aze\nrty\\r\\nqwerty[0m"
+[1mdouble[22m([33m4.34[0m)
diff --git a/tests/bug00947-2.phpt b/tests/bug00947-2.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test for bug #947: Newlines converted when html_errors = 0 (plain)
+--INI--
+html_errors=0
+xdebug.overload_var_dump=1
+xdebug.cli_color=0
+xdebug.default_enable=1
+--FILE--
+<?php
+$t = "\0" . 'aze
+rty\r\nqwerty';
+var_dump($t, 4.34);
+?>
+--EXPECT--
+string(18) "\000aze
+rty\r\nqwerty"
+double(4.34)
diff --git a/xdebug_profiler.c b/xdebug_profiler.c
@@ -66,7 +66,11 @@ int xdebug_profiler_init(char *script_name TSRMLS_DC)
 		/* Invalid or empty xdebug.profiler_output_name */
 		return FAILURE;
 	}
-	filename = xdebug_sprintf("%s/%s", XG(profiler_output_dir), fname);
+	if (IS_SLASH(XG(profiler_output_dir)[strlen(XG(profiler_output_dir)) - 1])) {
+		filename = xdebug_sprintf("%s%s", XG(profiler_output_dir), fname);
+	} else {
+		filename = xdebug_sprintf("%s%c%s", XG(profiler_output_dir), DEFAULT_SLASH, fname);
+	}
 	xdfree(fname);
 
 	if (XG(profiler_append)) {

diff --git a/xdebug_stack.c b/xdebug_stack.c
@@ -636,7 +636,9 @@ void xdebug_error_cb(int type, const char *error_filename, const uint error_line
 				xdebug_append_error_head(&str, PG(html_errors), "uncaught-exception" TSRMLS_CC);
 				xdebug_append_error_description(&str, PG(html_errors), error_type_str, tmp_buf, error_filename, error_lineno TSRMLS_CC);
 				xdebug_append_printable_stack(&str, PG(html_errors) TSRMLS_CC);
-				xdebug_str_add(&str, XG(last_exception_trace), 0);
+				if (XG(last_exception_trace)) {
+					xdebug_str_add(&str, XG(last_exception_trace), 0);
+				}
 				xdebug_append_error_footer(&str, PG(html_errors) TSRMLS_CC);
 				php_output_error(str.d TSRMLS_CC);
 

diff --git a/xdebug_tracing.c b/xdebug_tracing.c
@@ -437,7 +437,12 @@ char* xdebug_start_trace(char* fname, long options TSRMLS_DC)
 			/* Invalid or empty xdebug.trace_output_name */
 			return NULL;
 		}
-		filename = xdebug_sprintf("%s/%s", XG(trace_output_dir), fname);
+		if (IS_SLASH(XG(trace_output_dir)[strlen(XG(trace_output_dir)) - 1])) {
+			filename = xdebug_sprintf("%s%s", XG(trace_output_dir), fname);
+		} else {
+			filename = xdebug_sprintf("%s%c%s", XG(trace_output_dir), DEFAULT_SLASH, fname);
+		}
+		xdfree(fname);
 	}
 	if (options & XDEBUG_TRACE_OPTION_APPEND) {
 		XG(trace_file) = xdebug_fopen(filename, "a", "xt", (char**) &tmp_fname);

diff --git a/xdebug_var.c b/xdebug_var.c
@@ -396,7 +396,7 @@ void xdebug_var_export(zval **struc, xdebug_str *str, int level, int debug_zval,
 			break;
 
 		case IS_STRING:
-			tmp_str = php_addcslashes(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &tmp_len, 0, "'\\\0..\37", 6 TSRMLS_CC);
+			tmp_str = php_addcslashes(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &tmp_len, 0, "'\\\0..\37", 7 TSRMLS_CC);
 			if (options->no_decoration) {
 				xdebug_str_add(str, tmp_str, 0);
 			} else if (Z_STRLEN_PP(struc) <= options->max_data) {
@@ -711,9 +711,13 @@ void xdebug_var_export_text_ansi(zval **struc, xdebug_str *str, int mode, int le
 			break;
 
 		case IS_STRING:
-			tmp_str = php_addcslashes(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &tmp_len, 0, "\0..\37", 5 TSRMLS_CC);
+			if (mode == 1) {
+				tmp_str = php_addcslashes(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &tmp_len, 0, "'\\\0..\37", 7 TSRMLS_CC);
+			} else {
+				tmp_str = php_addcslashes(Z_STRVAL_PP(struc), Z_STRLEN_PP(struc), &tmp_len, 0, "\0", 1 TSRMLS_CC);
+			}
 			if (options->no_decoration) {
-				xdebug_str_add(str, tmp_str, 0);
+				xdebug_str_addl(str, tmp_str, tmp_len, 0);
 			} else if (Z_STRLEN_PP(struc) <= options->max_data) {
 				xdebug_str_add(str, xdebug_sprintf("%sstring%s(%s%ld%s) \"%s%s%s\"", ANSI_COLOR_BOLD, ANSI_COLOR_BOLD_OFF, 
 							ANSI_COLOR_LONG, Z_STRLEN_PP(struc), ANSI_COLOR_RESET,