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 /ext/simplexml/simplexml.c | |
| 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 'ext/simplexml/simplexml.c')
| -rw-r--r-- | ext/simplexml/simplexml.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c index 30f42ae5b7..42a365a05c 100644 --- a/ext/simplexml/simplexml.c +++ b/ext/simplexml/simplexml.c @@ -1785,9 +1785,8 @@ static void sxe_object_free_storage(void *object TSRMLS_DC) sxe = (php_sxe_object *) object; - zend_hash_destroy(sxe->zo.properties); - FREE_HASHTABLE(sxe->zo.properties); - + zend_object_std_dtor(&sxe->zo TSRMLS_CC); + php_libxml_node_decrement_resource((php_libxml_node_object *)sxe TSRMLS_CC); if (sxe->xpath) { @@ -1810,14 +1809,12 @@ static php_sxe_object* php_sxe_object_new(zend_class_entry *ce TSRMLS_DC) php_sxe_object *intern; intern = ecalloc(1, sizeof(php_sxe_object)); - intern->zo.ce = ce; intern->iter.type = SXE_ITER_NONE; intern->iter.nsprefix = NULL; intern->iter.name = NULL; - ALLOC_HASHTABLE(intern->zo.properties); - zend_hash_init(intern->zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0); + zend_object_std_init(&intern->zo, ce TSRMLS_CC); return intern; } |