Index: php_date.c
===================================================================
RCS file: /repository/php-src/ext/date/php_date.c,v
retrieving revision 1.43.2.19
diff -u -p -d -r1.43.2.19 php_date.c
--- php_date.c	19 Oct 2005 11:18:51 -0000	1.43.2.19
+++ php_date.c	15 Nov 2005 14:01:01 -0000
@@ -1024,7 +1024,7 @@ static zend_object_value date_object_new
 	memset(intern, 0, sizeof(php_date_obj));
 	intern->std.ce = class_type;
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) date_object_free_storage_date, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_date, NULL TSRMLS_CC);
 	retval.handlers = &date_object_handlers_date;
 	
 	return retval;
@@ -1039,7 +1039,7 @@ static zend_object_value date_object_new
 	memset(intern, 0, sizeof(php_timezone_obj));
 	intern->std.ce = class_type;
 
-	retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) date_object_free_storage_timezone, NULL TSRMLS_CC);
+	retval.handle = zend_objects_store_put(intern, (zend_objects_store_dtor_t)zend_objects_destroy_object, (zend_objects_free_object_storage_t) date_object_free_storage_timezone, NULL TSRMLS_CC);
 	retval.handlers = &date_object_handlers_timezone;
 	
 	return retval;
@@ -1049,10 +1049,12 @@ static void date_object_free_storage_dat
 {
 	php_date_obj *intern = (php_date_obj *)object;
 
-	if (intern->time->tz_info) {
-		timelib_tzinfo_dtor(intern->time->tz_info);
+	if (intern->time) {
+		if (intern->time->tz_info) {
+			timelib_tzinfo_dtor(intern->time->tz_info);
+		}
+		timelib_time_dtor(intern->time);
 	}
-	timelib_time_dtor(intern->time);
 
 	efree(object);
 }