From: Pierre Joye <pierre.php@gmail.com>
Date: Fri, 16 May 2014 12:31:20 +0000 (+0200)
Subject: hash find returns zval* now
X-Git-Tag: POST_PHPNG_MERGE~333^2~1^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0ae699ca2d0355490a37efc5dc5c1dd58054e84;p=php

hash find returns zval* now
---

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 2459746892..a23fc42635 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)) != SUCCESS) {
+			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)) {