com php-src: Use dtor unconditionally in error case: Zend/zend_object_handlers.c

From: Date: Mon, 04 Dec 2017 13:15:42 +0000
Subject: com php-src: Use dtor unconditionally in error case: Zend/zend_object_handlers.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-100478@lists.php.net to get a copy of this message
Commit: 0eb262eacb834c15c669cee19051f07bdc48ddd3 Author: Anatol Belski <ab@php.net> Mon, 4 Dec 2017 14:11:40 +0100 Parents: d4dee4a6144ff12c6ac4b29968dda13eda406011 Branches: PHP-7.0 PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0eb262eacb834c15c669cee19051f07bdc48ddd3 Log: Use dtor unconditionally in error case Changed paths: M Zend/zend_object_handlers.c Diff: diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 54f093a..791ae1c 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;

« previous php.cvs (#100478) next »