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_object_handlers.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_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 07d5039961..1ce666b719 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -1314,7 +1314,9 @@ ZEND_API zval *zend_std_get_static_property(zend_class_entry *ce, zend_string *p goto undeclared_property; } - zend_update_class_constants(ce); + if (UNEXPECTED(zend_update_class_constants(ce)) != SUCCESS) { + return NULL; + } ret = CE_STATIC_MEMBERS(ce) + property_info->offset; /* check if static properties were destoyed */ |