Fix DateInterval::format segfault

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 4cb0ec8ff40d4b24529b719ddcc1bba260de9da9..4bb088881e6af5b3f32dfe17da0c6fa45f980e90 100644 (file)
--- 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
new file mode 100644 (file)
index 0000000..129930a
--- /dev/null
+++ 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) ""