Fixed bug #49700 (memory leaks in php_date.c if garbage collector is enabled)

diff --git a/NEWS b/NEWS
index 18416632456098cabf437e55c9c5c39d558789f8..02e29d4d8103816fd1145cf2e5560fdd165177aa 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,8 @@ PHP                                                                        NEWS
 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
 - Fixed bug #49778 (DateInterval::format("%a") is always zero when an interval
   is created from an ISO string). (Derick)
+- Fixed bug #49700 (memory leaks in php_date.c if garbage collector is
+  enabled). (Dmitry)
 - Fixed bug #49576 (FILTER_VALIDATE_EMAIL filter needs updating) (Rasmus)
 - Fixed bug #49429 (odbc_autocommit doesn't work). (Felipe)
 - Fixed bug #49234 (mysqli_ssl_set not found). (Andrey)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 0cc86feeb7d0bf27aa717964821d549683d820ba..07cfcec2fb52d24d1f8428012c5d8e3790de5556 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2081,7 +2081,7 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
 
        props = dateobj->std.properties;
 
-       if (!dateobj->time) {
+       if (!dateobj->time || GC_G(gc_active)) {
                return props;
        }
 
@@ -2224,7 +2224,7 @@ static HashTable *date_object_get_properties_interval(zval *object TSRMLS_DC)
 
        props = intervalobj->std.properties;
 
-       if (!intervalobj->initialized) {
+       if (!intervalobj->initialized || GC_G(gc_active)) {
                return props;
        }
 

diff --git a/ext/date/tests/bug49700.phpt b/ext/date/tests/bug49700.phpt
new file mode 100644 (file)
index 0000000..a347052
--- /dev/null
+++ b/ext/date/tests/bug49700.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #49700 (memory leaks in php_date.c if garbage collector is enabled)
+--INI--
+date.timezone=GMT
+--FILE--
+<?php
+gc_enable();
+$objs = array();
+$objs[1] = new DateTime();
+gc_collect_cycles();
+unset($objs);
+echo "OK\n";
+?>
+--EXPECT--
+OK