felipe Tue Apr 7 20:05:50 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/date/tests bug46108.phpt
Modified files:
/php-src NEWS
/php-src/ext/date php_date.c
Log:
- MFH: Fixed bug #46108 (DateTime - Memory leak when unserializing)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.553&r2=1.2027.2.547.2.965.2.554&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.553
php-src/NEWS:1.2027.2.547.2.965.2.554
--- php-src/NEWS:1.2027.2.547.2.965.2.553 Mon Apr 6 11:10:31 2009
+++ php-src/NEWS Tue Apr 7 20:05:49 2009
@@ -24,6 +24,7 @@
- Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in
double quote). (Dmitry)
- Fixed bug #47038 (Memory leak in include). (Dmitry)
+- Fixed bug #46108 (DateTime - Memory leak when unserializing). (Felipe)
- Fixed bug #44861 (scrollable cursor don't work with pgsql). (Matteo)
- Fixed bug #44409 (PDO::FETCH_SERIALIZE calls __construct()). (Matteo)
- Fixed bug #44173 (PDO->query() parameter parsing/checking needs an
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.66&r2=1.43.2.45.2.51.2.67&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.66
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.67
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.66 Fri Mar 27 19:22:29 2009
+++ php-src/ext/date/php_date.c Tue Apr 7 20:05:50 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.66 2009/03/27 19:22:29 bjori Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.67 2009/04/07 20:05:50 felipe Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2268,10 +2268,6 @@
/* Advanced Interface */
static zval * date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
{
- if (!object) {
- ALLOC_ZVAL(object);
- }
-
Z_TYPE_P(object) = IS_OBJECT;
object_init_ex(object, pce);
Z_SET_REFCOUNT_P(object, 1);
@@ -2461,12 +2457,14 @@
tzi =
php_date_parse_tzfile(Z_STRVAL_PP(z_timezone), DATE_TIMEZONEDB TSRMLS_CC);
+ ALLOC_INIT_ZVAL(tmp_obj);
tzobj =
zend_object_store_get_object(date_instantiate(date_ce_timezone, tmp_obj
TSRMLS_CC) TSRMLS_CC);
tzobj->type =
TIMELIB_ZONETYPE_ID;
tzobj->tzi.tz = tzi;
tzobj->initialized = 1;
date_initialize(*dateobj,
Z_STRVAL_PP(z_date), Z_STRLEN_PP(z_date), NULL, tmp_obj, 0 TSRMLS_CC);
+ zval_ptr_dtor(&tmp_obj);
return 1;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/bug46108.phpt?view=markup&rev=1.1
Index: php-src/ext/date/tests/bug46108.phpt
+++ php-src/ext/date/tests/bug46108.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
