com php-src: Unexpected: Zend/zend_object_handlers.c
| From: | Xinchen Hui | Date: | Thu, 10 Sep 2015 06:57:22 +0000 |
| Subject: | com php-src: Unexpected: Zend/zend_object_handlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88984@lists.php.net to get a copy of this message | ||
Commit: 7a0e68b97cb1ee4c8364fe25ea18fe1c2e16102d
Author: Xinchen Hui <laruence@gmail.com> Thu, 10 Sep 2015 14:57:22 +0800
Parents: 6852f9cd437a64d15bcd629f38cd9d7c8f0f0996
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7a0e68b97cb1ee4c8364fe25ea18fe1c2e16102d
Log:
Unexpected
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 14a68a8..a8ffcc1 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -602,7 +602,7 @@ zval *zend_std_read_property(zval *object, zval *member, int type, void **cache_
retval = &EG(uninitialized_zval);
exit:
- if (Z_REFCOUNTED(tmp_member)) {
+ if (UNEXPECTED(Z_REFCOUNTED(tmp_member))) {
zval_ptr_dtor(&tmp_member);
}
@@ -702,7 +702,7 @@ write_std_property:
}
exit:
- if (Z_REFCOUNTED(tmp_member)) {
+ if (UNEXPECTED(Z_REFCOUNTED(tmp_member))) {
zval_ptr_dtor(&tmp_member);
}
}
@@ -934,7 +934,7 @@ static void zend_std_unset_property(zval *object, zval *member, void **cache_slo
}
exit:
- if (Z_REFCOUNTED(tmp_member)) {
+ if (UNEXPECTED(Z_REFCOUNTED(tmp_member))) {
zval_ptr_dtor(&tmp_member);
}
}
@@ -1506,7 +1506,7 @@ found:
}
exit:
- if (Z_REFCOUNTED(tmp_member)) {
+ if (UNEXPECTED(Z_REFCOUNTED(tmp_member))) {
zval_ptr_dtor(&tmp_member);
}
return result;