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 /ext/standard/basic_functions.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 'ext/standard/basic_functions.c')
| -rw-r--r-- | ext/standard/basic_functions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7bf51eb5d5..36d530d47b 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -3827,7 +3827,9 @@ PHP_FUNCTION(constant) if (c) { ZVAL_COPY_VALUE(return_value, c); if (Z_CONSTANT_P(return_value)) { - zval_update_constant_ex(return_value, 1, NULL); + if (UNEXPECTED(zval_update_constant_ex(return_value, 1, NULL) != SUCCESS)) { + return; + } } zval_copy_ctor(return_value); } else { |