Fix leak on failed DatePeriod initialization

We need to free not only p here, but also b and e.

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 0892439a0671b63609bbaf12a1bacf9b1a6b5736..43aa2ba637e6a5a4d752408d756046154d4c1d86 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -4077,6 +4077,12 @@ static int date_period_initialize(timelib_time **st, timelib_time **et, timelib_
        if (errors->error_count > 0) {
                php_error_docref(NULL, E_WARNING, "Unknown or bad format (%s)", format);
                retval = FAILURE;
+               if (b) {
+                       timelib_time_dtor(b);
+               }
+               if (e) {
+                       timelib_time_dtor(e);
+               }
                if (p) {
                        timelib_rel_time_dtor(p);
                }

diff --git a/ext/date/tests/date_interval_bad_format_leak.phpt b/ext/date/tests/date_interval_bad_format_leak.phpt
index d15bf57b3f0100dcb4382a1d103ca048cccb8953..da6982c9bedb2e10d14f9a3b1bb51813430f144c 100644 (file)
--- a/ext/date/tests/date_interval_bad_format_leak.phpt
+++ b/ext/date/tests/date_interval_bad_format_leak.phpt
@@ -15,7 +15,14 @@ try {
     echo $e->getMessage(), "\n";
 }
 
+try {
+    new DatePeriod('2008-03-01T12:00:00Z1');
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
 ?>
 --EXPECT--
 DateInterval::__construct(): Unknown or bad format (P3"D)
 DatePeriod::__construct(): Unknown or bad format (P3"D)
+DatePeriod::__construct(): Unknown or bad format (2008-03-01T12:00:00Z1)