diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-03-29 14:28:43 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-03-29 14:28:43 +0000 |
| commit | 59b8592c8cb51599147f990ad8b61d8d02cfce05 (patch) | |
| tree | 9bf669097b48484400efe53cb52ff567c51ff8e7 /Zend | |
| parent | 697c652001257e04a5af0f047017fe20f62ee969 (diff) | |
| download | php-git-59b8592c8cb51599147f990ad8b61d8d02cfce05.tar.gz | |
fix bug #36898 (__set() leaks in classes extending internal ones)
Added:
ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC)
ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC)
to initialize and destroy zend_object structs
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_objects.c | 27 | ||||
| -rw-r--r-- | Zend/zend_objects.h | 2 |
2 files changed, 23 insertions, 6 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 9611bddc4c..6e2c472713 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -25,6 +25,26 @@ #include "zend_API.h" #include "zend_interfaces.h" +ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC) +{ + ALLOC_HASHTABLE(object->properties); + zend_hash_init(object->properties, 0, NULL, ZVAL_PTR_DTOR, 0); + + object->ce = ce; + object->guards = NULL; +} + +ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC) +{ + if (object->guards) { + zend_hash_destroy(object->guards); + FREE_HASHTABLE(object->guards); + } + if (object->properties) { + zend_hash_destroy(object->properties); + FREE_HASHTABLE(object->properties); + } +} ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC) { @@ -88,12 +108,7 @@ ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handl ZEND_API void zend_objects_free_object_storage(zend_object *object TSRMLS_DC) { - if (object->guards) { - zend_hash_destroy(object->guards); - FREE_HASHTABLE(object->guards); - } - zend_hash_destroy(object->properties); - FREE_HASHTABLE(object->properties); + zend_object_std_dtor(object TSRMLS_CC); efree(object); } diff --git a/Zend/zend_objects.h b/Zend/zend_objects.h index 082e8d1a5f..a90ed2123d 100644 --- a/Zend/zend_objects.h +++ b/Zend/zend_objects.h @@ -25,6 +25,8 @@ #include "zend.h" BEGIN_EXTERN_C() +ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC); +ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC); ZEND_API zend_object_value zend_objects_new(zend_object **object, zend_class_entry *class_type TSRMLS_DC); ZEND_API void zend_objects_destroy_object(zend_object *object, zend_object_handle handle TSRMLS_DC); ZEND_API zend_object *zend_objects_get_address(zval *object TSRMLS_DC); |