diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-09-10 14:39:25 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-09-10 14:39:25 +0800 |
| commit | 6852f9cd437a64d15bcd629f38cd9d7c8f0f0996 (patch) | |
| tree | 44c2097e334f1592f3a4543134a50484b0eac475 /Zend/zend_object_handlers.c | |
| parent | 27f6b8864e8506d3adca32810e350a132150ed03 (diff) | |
| download | php-git-6852f9cd437a64d15bcd629f38cd9d7c8f0f0996.tar.gz | |
cleanup tmp_member handling
Diffstat (limited to 'Zend/zend_object_handlers.c')
| -rw-r--r-- | Zend/zend_object_handlers.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c index 32534d02de..14a68a87d2 100644 --- a/Zend/zend_object_handlers.c +++ b/Zend/zend_object_handlers.c @@ -602,11 +602,10 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_ retval = &EG(uninitialized_zval); exit: - if (UNEXPECTED(Z_TYPE(tmp_member) != IS_UNDEF)) { - if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval); + if (Z_REFCOUNTED(tmp_member)) { zval_ptr_dtor(&tmp_member); - if (Z_REFCOUNTED_P(retval)) Z_DELREF_P(retval); } + return retval; } /* }}} */ @@ -703,7 +702,7 @@ write_std_property: } exit: - if (UNEXPECTED(Z_TYPE(tmp_member) != IS_UNDEF)) { + if (Z_REFCOUNTED(tmp_member)) { zval_ptr_dtor(&tmp_member); } } @@ -935,7 +934,7 @@ static void zend_std_unset_property(zval *object, zval *member, void **cache_slo } exit: - if (UNEXPECTED(Z_TYPE(tmp_member) != IS_NULL)) { + if (Z_REFCOUNTED(tmp_member)) { zval_ptr_dtor(&tmp_member); } } @@ -1507,7 +1506,7 @@ found: } exit: - if (UNEXPECTED(Z_TYPE(tmp_member) != IS_UNDEF)) { + if (Z_REFCOUNTED(tmp_member)) { zval_ptr_dtor(&tmp_member); } return result; |