diff options
| author | Stanislav Malyshev <stas@php.net> | 2003-07-27 13:20:31 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2003-07-27 13:20:31 +0000 |
| commit | 9fa2d5231091889fce06a2e79b449484cfe2e8d6 (patch) | |
| tree | 0f642179e3d5c237db9710f7bf5a7e7ea4d9416d /Zend/zend_objects.c | |
| parent | 6bea4ca1b051e3a7e1a0bf3aa3080934d7c143b6 (diff) | |
| download | php-git-9fa2d5231091889fce06a2e79b449484cfe2e8d6.tar.gz | |
make clone and throw coexist peacefully
Diffstat (limited to 'Zend/zend_objects.c')
| -rw-r--r-- | Zend/zend_objects.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_objects.c b/Zend/zend_objects.c index 19d567b95f..7749baf7db 100644 --- a/Zend/zend_objects.c +++ b/Zend/zend_objects.c @@ -143,7 +143,9 @@ ZEND_API void zend_objects_clone_members(zend_object *new_object, zend_object_va zend_hash_destroy(&symbol_table); zval_ptr_dtor(&new_obj); zval_ptr_dtor(&clone_func_name); - zval_ptr_dtor(&retval_ptr); + if(retval_ptr) { + zval_ptr_dtor(&retval_ptr); + } } else { zend_hash_copy(new_object->properties, old_object->properties, (copy_ctor_func_t) zval_add_ref, (void *) NULL /* Not used anymore */, sizeof(zval *)); } |