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_constants.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_constants.c')
| -rw-r--r-- | Zend/zend_constants.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_constants.c b/Zend/zend_constants.c index da842364be..32f249ce08 100644 --- a/Zend/zend_constants.c +++ b/Zend/zend_constants.c @@ -375,7 +375,9 @@ ZEND_API zval *zend_get_constant_ex(zend_string *cname, zend_class_entry *scope, zend_string_release(class_name); zend_string_free(constant_name); if (ret_constant && Z_CONSTANT_P(ret_constant)) { - zval_update_constant_ex(ret_constant, 1, ce); + if (UNEXPECTED(zval_update_constant_ex(ret_constant, 1, ce) != SUCCESS)) { + return NULL; + } } return ret_constant; } |