archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Fixed bug #52773 (Proxy objects have an inadequate destroy_object store callback)

Browse source 
- Fixed bug #52774 (Proxy object's store free callback calls zval_ptor_dtor on already freed data)
This commit is contained in:
Dmitry Stogov 2010-10-04 07:15:30 +00:00
parent e1aa908468
commit e8c87c6d21
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Zend/zend_objects_API.c
View file

@ -314,6 +314,10 @@ typedef struct _zend_proxy_object {
static zend_object_handlers zend_object_proxy_handlers; static zend_object_handlers zend_object_proxy_handlers;
ZEND_API void zend_objects_proxy_destroy(zend_object *object, zend_object_handle handle TSRMLS_DC)
{
}
ZEND_API void zend_objects_proxy_free_storage(zend_proxy_object *object TSRMLS_DC) ZEND_API void zend_objects_proxy_free_storage(zend_proxy_object *object TSRMLS_DC)
{ {
zval_ptr_dtor(&object->object); zval_ptr_dtor(&object->object);
@ -336,13 +340,14 @@ ZEND_API zval *zend_object_create_proxy(zval *object, zval *member TSRMLS_DC)
zval *retval; zval *retval;
pobj->object = object; pobj->object = object;
pobj->property = member;
zval_add_ref(&pobj->property);
zval_add_ref(&pobj->object); zval_add_ref(&pobj->object);
ALLOC_ZVAL(pobj->property);
INIT_PZVAL_COPY(pobj->property, member);
zval_copy_ctor(pobj->property);
MAKE_STD_ZVAL(retval); MAKE_STD_ZVAL(retval);
Z_TYPE_P(retval) = IS_OBJECT; Z_TYPE_P(retval) = IS_OBJECT;
Z_OBJ_HANDLE_P(retval) = zend_objects_store_put(pobj, NULL, (zend_objects_free_object_storage_t) zend_objects_proxy_free_storage, (zend_objects_store_clone_t) zend_objects_proxy_clone TSRMLS_CC); Z_OBJ_HANDLE_P(retval) = zend_objects_store_put(pobj, (zend_objects_store_dtor_t)zend_objects_proxy_destroy, (zend_objects_free_object_storage_t) zend_objects_proxy_free_storage, (zend_objects_store_clone_t) zend_objects_proxy_clone TSRMLS_CC);
Z_OBJ_HT_P(retval) = &zend_object_proxy_handlers; Z_OBJ_HT_P(retval) = &zend_object_proxy_handlers;
return retval; return retval;