]> granicus.if.org Git - php/commitdiff
Use dtor unconditionally in error case
authorAnatol Belski <ab@php.net>
Mon, 4 Dec 2017 13:11:40 +0000 (14:11 +0100)
committerAnatol Belski <ab@php.net>
Mon, 4 Dec 2017 13:15:42 +0000 (14:15 +0100)
Zend/zend_object_handlers.c

index 54f093ae1045f7ab79eeb95b00ec427d2ecba029..791ae1ccfae0ba5ddf24fe9a5b837dd082a9562b 100644 (file)
@@ -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;