Merge branch 'xdebug_3_5'

* xdebug_3_5:
  Fixed issue #2429: Crash when trace_output_name setting is wrong

Author: derickr

src/lib/usefulstuff.c

@@ -622,6 +622,11 @@ int xdebug_format_output_filename(char **filename, char *format, char *script_na
 				case '%': /* literal % */
 					xdebug_str_addc(&fname, '%');
 					break;
+
+				case '\0': /* trailing % */
+					xdebug_str_addc(&fname, '%');
+					format--;
+					break;
 			}
 		}
 		format++;
@@ -719,6 +724,11 @@ int xdebug_format_filename(char **formatted_name, const char *default_fmt, zend_
 				case '%': /* literal % */
 					xdebug_str_addc(&fname, '%');
 					break;
+
+				case '\0': /* trailing % */
+					xdebug_str_addc(&fname, '%');
+					format--;
+					break;
 			}
 		}
 		format++;

tests/tracing/bug02429.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Test for bug #2429: Crash when trace_output_name setting is wrong
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+?>
+--INI--
+xdebug.mode=trace,develop
+xdebug.start_with_request=yes
+xdebug.trace_output_name=trace.%
+xdebug.use_compression=0
+log_errors=0
+--FILE--
+<?php
+$tfn = xdebug_get_tracefile_name();
+
+echo $tfn, "\n";
+
+@unlink($tfn);
+?>
+--EXPECTF--
+%strace.%.xt