summaryrefslogtreecommitdiff
path: root/Zend/zend_interfaces.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-04-02 02:05:25 +0300
committerDmitry Stogov <dmitry@zend.com>2015-04-02 02:05:25 +0300
commitea09a9fa325fe21ebc81c41a63ab8c2f377d7f75 (patch)
tree333736f85df668e9cba95ee567a59d3e889260c3 /Zend/zend_interfaces.c
parent956fa034e3b9de643153fd83fd63d36547bfa821 (diff)
downloadphp-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_interfaces.c')
-rw-r--r--Zend/zend_interfaces.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c
index 28f651cc85..93c0209a96 100644
--- a/Zend/zend_interfaces.c
+++ b/Zend/zend_interfaces.c
@@ -447,7 +447,9 @@ ZEND_API int zend_user_unserialize(zval *object, zend_class_entry *ce, const uns
{
zval zdata;
- object_init_ex(object, ce);
+ if (UNEXPECTED(object_init_ex(object, ce) != SUCCESS)) {
+ return FAILURE;
+ }
ZVAL_STRINGL(&zdata, (char*)buf, buf_len);