diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 02:05:25 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-04-02 02:05:25 +0300 |
| commit | ea09a9fa325fe21ebc81c41a63ab8c2f377d7f75 (patch) | |
| tree | 333736f85df668e9cba95ee567a59d3e889260c3 /Zend/zend_execute.c | |
| parent | 956fa034e3b9de643153fd83fd63d36547bfa821 (diff) | |
| download | php-git-ea09a9fa325fe21ebc81c41a63ab8c2f377d7f75.tar.gz | |
Convert fatal errors into EngineExceptions
Make zval_update_constant_ex(), zval_update_constant(), zend_update_class_constants() and zend_ast_evaluate() return SUCCESS or FAILURE.
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 06c25c7bc1..424f4888e9 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -629,7 +629,9 @@ static int is_null_constant(zval *default_value) zval constant; ZVAL_COPY_VALUE(&constant, default_value); - zval_update_constant(&constant, 0); + if (UNEXPECTED(zval_update_constant_ex(&constant, 0, NULL) != SUCCESS)) { + return 0; + } if (Z_TYPE(constant) == IS_NULL) { return 1; } @@ -1714,7 +1716,6 @@ static zend_always_inline void zend_fetch_property_address(zval *result, zval *c static inline zend_brk_cont_element* zend_brk_cont(int nest_levels, int array_offset, const zend_op_array *op_array, const zend_execute_data *execute_data) { - int original_nest_levels = nest_levels; zend_brk_cont_element *jmp_to; do { |