summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-12-04 14:11:40 +0100
committerAnatol Belski <ab@php.net>2017-12-04 14:15:42 +0100
commit0eb262eacb834c15c669cee19051f07bdc48ddd3 (patch)
tree09e01023657f7181a90af1e94c01e578638d3bc9
parentd4dee4a6144ff12c6ac4b29968dda13eda406011 (diff)
downloadphp-git-0eb262eacb834c15c669cee19051f07bdc48ddd3.tar.gz
Use dtor unconditionally in error case
-rw-r--r--Zend/zend_object_handlers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 54f093ae10..791ae1ccfa 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -603,12 +603,12 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_
goto exit;
} else {
if (Z_STRVAL_P(member)[0] == '\0') {
+ zval_ptr_dtor(&tmp_object);
if (Z_STRLEN_P(member) == 0) {
zend_throw_error(NULL, "Cannot access empty property");
retval = &EG(uninitialized_zval);
goto exit;
} else {
- zval_ptr_dtor(&tmp_object);
zend_throw_error(NULL, "Cannot access property started with '\\0'");
retval = &EG(uninitialized_zval);
goto exit;