iliaa Thu Jun 25 12:41:41 2009 UTC
Modified files:
/php-src/ext/date php_date.c
Log:
Fixed bug #48678 (DateInterval segfaults when unserialising)
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.239&r2=1.240&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.239 php-src/ext/date/php_date.c:1.240
--- php-src/ext/date/php_date.c:1.239 Mon Jun 22 13:43:06 2009
+++ php-src/ext/date/php_date.c Thu Jun 25 12:41:41 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.239 2009/06/22 13:43:06 iliaa Exp $ */
+/* $Id: php_date.c,v 1.240 2009/06/25 12:41:41 iliaa Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2316,6 +2316,10 @@
props = intervalobj->std.properties;
+ if (!intervalobj->initialized) {
+ return props;
+ }
+
#define PHP_DATE_INTERVAL_ADD_PROPERTY(n,f) \
MAKE_STD_ZVAL(zv); \
ZVAL_LONG(zv, intervalobj->diff->f); \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
