diff options
| author | Zeev Suraski <zeev@php.net> | 2001-02-12 15:16:11 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-02-12 15:16:11 +0000 |
| commit | d854b26e4308e1df9261a94cdb58cfdc5a8d5baa (patch) | |
| tree | 8505e55af33a31619f3b6ebe6c871a91fc5e8921 /Zend/zend_execute_API.c | |
| parent | 201342385eac76592372fa26abd3283e4c54cacc (diff) | |
| download | php-git-d854b26e4308e1df9261a94cdb58cfdc5a8d5baa.tar.gz | |
Fix a bug that could cause corruption in case of an error during
get_zval_ptr()
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 61087edf63..57105fad66 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -342,6 +342,9 @@ int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *fun zend_function_state *original_function_state_ptr; zend_op_array *original_op_array; zend_op **original_opline_ptr; + int orig_free_op1, orig_free_op2; + int (*orig_unary_op)(zval *result, zval *op1); + int (*orig_binary_op)(zval *result, zval *op1, zval *op2); ELS_FETCH(); *retval_ptr_ptr = NULL; @@ -448,6 +451,10 @@ int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *fun EG(return_value_ptr_ptr) = retval_ptr_ptr; EG(active_op_array) = (zend_op_array *) function_state.function; original_opline_ptr = EG(opline_ptr); + orig_free_op1 = EG(free_op1); + orig_free_op2 = EG(free_op2); + orig_unary_op = EG(unary_op); + orig_binary_op = EG(binary_op); zend_execute(EG(active_op_array) ELS_CC); if (!symbol_table) { zend_hash_destroy(EG(active_symbol_table)); @@ -457,6 +464,10 @@ int call_user_function_ex(HashTable *function_table, zval **object_pp, zval *fun EG(active_op_array) = original_op_array; EG(return_value_ptr_ptr)=original_return_value; EG(opline_ptr) = original_opline_ptr; + EG(free_op1) = orig_free_op1; + EG(free_op2) = orig_free_op2; + EG(unary_op) = orig_unary_op; + EG(binary_op) = orig_binary_op; } else { ALLOC_INIT_ZVAL(*retval_ptr_ptr); ((zend_internal_function *) function_state.function)->handler(param_count, *retval_ptr_ptr, (object_pp?*object_pp:NULL), 1 ELS_CC); |