Fix DateInterval::format segfault

tpunt · weltling · commit 40f14bad33f4 · 2016-04-05T11:18:14.000+02:00
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -4359,6 +4359,10 @@ static char *date_interval_format(char *format, int format_len, timelib_rel_time
 
 	smart_str_0(&string);
 
+	if (string.c == NULL) {
+		return estrdup("");
+	}
+
 	return string.c;
 }
 /* }}} */
diff --git a/ext/date/tests/bug71889.phpt b/ext/date/tests/bug71889.phpt
@@ -0,0 +1,11 @@
+--TEST--
+Bug #71889 (DateInterval::format segfault on '%' input)
+--INI--
+date.timezone=US/Eastern
+--FILE--
+<?php
+$di = new DateInterval('P1D');
+var_dump($di->format("%"));
+?>
+--EXPECT--
+string(0) ""

Original file line number	Diff line number	Diff line change
`@@ -4359,6 +4359,10 @@ static char date_interval_format(char format, int format_len, timelib_rel_time`
`4359`	`4359`
`4360`	`4360`	`smart_str_0(&string);`
`4361`	`4361`
	`4362`	`+ if (string.c == NULL) {`
	`4363`	`+ return estrdup("");`
	`4364`	`+ }`
	`4365`	`+`
`4362`	`4366`	`return string.c;`
`4363`	`4367`	`}`
`4364`	`4368`	`/* }}} */`