diff options
| author | Andi Gutmans <andi@php.net> | 2001-08-07 03:17:33 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-08-07 03:17:33 +0000 |
| commit | 5af7770a816fd74331afdee06e61acea184ac87d (patch) | |
| tree | 33f971900976da98abd9585e593f0edde3f8671b /Zend/zend_execute_API.c | |
| parent | 6737ea6fd45c12fcd1282f325202d652878afd26 (diff) | |
| download | php-git-5af7770a816fd74331afdee06e61acea184ac87d.tar.gz | |
- Sync Engine2 CVS with latest Engine CVS
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 1c9e42a5e4..971d00fe0b 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -151,7 +151,7 @@ void init_executor(TSRMLS_D) zend_ptr_stack_init(&EG(user_error_handlers)); EG(orig_error_reporting) = EG(error_reporting); - + zend_objects_init(&EG(objects), 1024); #ifdef ZEND_WIN32 EG(timed_out) = 0; #endif @@ -207,6 +207,7 @@ void shutdown_executor(TSRMLS_D) zend_ptr_stack_destroy(&EG(user_error_handlers)); EG(error_reporting) = EG(orig_error_reporting); + zend_objects_destroy(&EG(objects)); } zend_end_try(); } @@ -268,7 +269,7 @@ ZEND_API void _zval_ptr_dtor(zval **zval_ptr ZEND_FILE_LINE_DC) if ((*zval_ptr)->refcount==0) { zval_dtor(*zval_ptr); safe_free_zval_ptr(*zval_ptr); - } else if (((*zval_ptr)->refcount == 1) && ((*zval_ptr)->type != IS_OBJECT)) { + } else if ((*zval_ptr)->refcount == 1) { (*zval_ptr)->is_ref = 0; } } @@ -411,7 +412,7 @@ int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *fun } if (object_pp) { if (Z_TYPE_PP(object_pp) == IS_OBJECT) { - function_table = &(*object_pp)->value.obj.ce->function_table; + function_table = &Z_OBJCE_PP(object_pp)->function_table; } else if (Z_TYPE_PP(object_pp) == IS_STRING) { zend_class_entry *ce; char *lc_class; |