diff options
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 59e585e35b..4a8b4694b7 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -411,9 +411,10 @@ static zend_always_inline zval *_get_zval_ptr(int op_type, znode_op node, const *should_free = NULL; if (op_type == IS_CONST) { return EX_CONSTANT(node); - } else { - ZEND_ASSERT(op_type == IS_CV); + } else if (op_type == IS_CV) { return _get_zval_ptr_cv(execute_data, node.var, type); + } else { + return NULL; } } } @@ -431,9 +432,10 @@ static zend_always_inline zval *_get_zval_ptr_deref(int op_type, znode_op node, *should_free = NULL; if (op_type == IS_CONST) { return EX_CONSTANT(node); - } else { - ZEND_ASSERT(op_type == IS_CV); + } else if (op_type == IS_CV) { return _get_zval_ptr_cv_deref(execute_data, node.var, type); + } else { + return NULL; } } } @@ -1688,8 +1690,6 @@ static int zend_check_symbol(zval *pz) #define CHECK_SYMBOL_TABLES() #endif -ZEND_API opcode_handler_t *zend_opcode_handlers; - ZEND_API void execute_internal(zend_execute_data *execute_data, zval *return_value) { execute_data->func->internal_function.handler(execute_data, return_value); |