com php-src: Fixed wrong condition: Zend/zend_object_handle rs.c
| From: | Dmitry Stogov | Date: | Sun, 18 May 2014 09:28:06 +0000 |
| Subject: | com php-src: Fixed wrong condition: Zend/zend_object_handle rs.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78436@lists.php.net to get a copy of this message | ||
Commit: 41336194b5af6c1a66d749b3d88c4566485322a9
Author: Dmitry Stogov <dmitry@zend.com> Sun, 18 May 2014 13:28:06 +0400
Parents: c7e6d3acceff3ffa9160844d6728a3d9b2026726
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=41336194b5af6c1a66d749b3d88c4566485322a9
Log:
Fixed wrong condition
Changed paths:
M Zend/zend_object_handlers.c
Diff:
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index a23fc42..5dff0d9 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers..c
@@ -1091,7 +1091,7 @@ static union _zend_function *zend_std_get_method(zend_object **obj_ptr,
zend_str
if (EG(scope) &&
is_derived_class(fbc->common.scope, EG(scope)) &&
fbc->op_array.fn_flags & ZEND_ACC_CHANGED) {
- if ((func = zend_hash_find(&EG(scope)->function_table, lc_method_name)) == NULL) {
+ if ((func = zend_hash_find(&EG(scope)->function_table, lc_method_name)) != NULL) {
zend_function *priv_fbc = Z_FUNC_P(func);
if (priv_fbc->common.fn_flags & ZEND_ACC_PRIVATE
&& priv_fbc->common.scope == EG(scope)) {