From e7d3ec6dee56adcadee72b9991f828f34fe4938c Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 20 Apr 2010 15:41:35 +0000 Subject: [PATCH] Fixed bug #49700 (memory leaks in php_date.c if garbage collector is enabled) --- ext/date/php_date.c | 4 ++-- ext/date/tests/bug49700.phpt | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 ext/date/tests/bug49700.phpt diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 27025c096e..48b000272e 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -2080,7 +2080,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; } @@ -2223,7 +2223,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 index 0000000000..a347052593 --- /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-- + +--EXPECT-- +OK -- 2.50.1