diff options
| author | Dmitry Stogov <dmitry@php.net> | 2009-02-09 09:20:35 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2009-02-09 09:20:35 +0000 |
| commit | c277ebc6c8076ffdabad78d76b05538345207685 (patch) | |
| tree | 4af03990d43e5cb50b8973f375a3b6268ae3743c /Zend/zend_execute_API.c | |
| parent | c13177f18299b671dc7f157f3b7bf2eadbb38f4d (diff) | |
| download | php-git-c277ebc6c8076ffdabad78d76b05538345207685.tar.gz | |
Fixed bug #47320 ($php_errormsg out of scope in functions)
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 3bdfc5b6e0..36240eefce 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1631,15 +1631,15 @@ ZEND_API void zend_rebuild_symbol_table(TSRMLS_D) /* {{{ */ return; } - if (EG(symtable_cache_ptr)>=EG(symtable_cache)) { - /*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/ - EG(active_symbol_table) = *(EG(symtable_cache_ptr)--); - } else { - ALLOC_HASHTABLE(EG(active_symbol_table)); - zend_hash_init(EG(active_symbol_table), 0, NULL, ZVAL_PTR_DTOR, 0); - /*printf("Cache miss! Initialized %x\n", EG(active_symbol_table));*/ - } if (ex && ex->op_array) { + if (EG(symtable_cache_ptr)>=EG(symtable_cache)) { + /*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/ + EG(active_symbol_table) = *(EG(symtable_cache_ptr)--); + } else { + ALLOC_HASHTABLE(EG(active_symbol_table)); + zend_hash_init(EG(active_symbol_table), 0, NULL, ZVAL_PTR_DTOR, 0); + /*printf("Cache miss! Initialized %x\n", EG(active_symbol_table));*/ + } ex->symbol_table = EG(active_symbol_table); if (ex->op_array->this_var != -1 && |