[PHP-CVS] cvs: php-src /ext/date php_date.c

[Antony Dovgal]

tony2001                Sat Nov 26 04:39:53 2005 EDT

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  fix #35402 (New date class causes crash in get_object_vars())
  
  
http://cvs.php.net/diff.php/php-src/ext/date/php_date.c?r1=1.68&r2=1.69&ty=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.68 php-src/ext/date/php_date.c:1.69
--- php-src/ext/date/php_date.c:1.68    Sun Nov 20 15:31:48 2005
+++ php-src/ext/date/php_date.c Sat Nov 26 04:39:50 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.68 2005/11/20 20:31:48 derick Exp $ */
+/* $Id: php_date.c,v 1.69 2005/11/26 09:39:50 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1152,11 +1152,16 @@
 {
        php_date_obj *intern;
        zend_object_value retval;
+       zval *tmp;
 
        intern = emalloc(sizeof(php_date_obj));
        memset(intern, 0, sizeof(php_date_obj));
        intern->std.ce = class_type;
-
+       
+       ALLOC_HASHTABLE(intern->std.properties);
+       zend_hash_init(intern->std.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
+       zend_hash_copy(intern->std.properties, &class_type->default_properties, 
(copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+       
        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;
        
@@ -1189,6 +1194,12 @@
                timelib_time_dtor(intern->time);
        }
 
+       if (intern->std.properties) {
+               zend_hash_destroy(intern->std.properties);
+               efree(intern->std.properties);
+               intern->std.properties = NULL;
+       }
+       
        efree(object);
 }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php