From: Dmitry Stogov <dmitry@php.net>
Date: Thu, 7 Aug 2008 12:03:51 +0000 (+0000)
Subject: Fixed bug #45744 (Case sensitive callback behaviour)
X-Git-Tag: BEFORE_HEAD_NS_CHANGE~831
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d24ecd145868f651638e14adfb55b429294e257b;p=php

Fixed bug #45744 (Case sensitive callback behaviour)
---

diff --git a/Zend/tests/bug45744.phpt b/Zend/tests/bug45744.phpt
new file mode 100644
index 0000000000..029efcfe63
--- /dev/null
+++ b/Zend/tests/bug45744.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Bug #45744 (Case sensitive callback behaviour)
+--FILE--
+<?php
+class Foo {
+    public function __construct(array $data) {
+		var_dump(array_map(array($this, 'callback'), $data));
+    }
+    
+    private function callback($value) {
+        if (!is_array($value)) {
+            return stripslashes($value);
+        }
+	return array_map(array($this, 'callback'), $value);
+    }
+}
+
+class Bar extends Foo {
+}
+
+new Bar(array());
+
+class Foo2 {
+    public function __construct(array $data) {
+		var_dump(array_map(array($this, 'callBack'), $data));
+    }
+    
+    private function callBack($value) {
+    }
+}
+
+class Bar2 extends Foo2 {
+}
+
+new Bar2(array());
+--EXPECT--
+array(0) {
+}
+array(0) {
+}
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index bb6a7218b2..b142c1f1bb 100644
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -2899,7 +2899,6 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 		retval = fcc->function_handler ? 1 : 0;
 		call_via_handler = 1;
 	}
-	efree(lmname.v);
 
 	if (retval) {
 		if (fcc->calling_scope && !call_via_handler) {
@@ -2934,7 +2933,7 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 			}
 			if (retval && (check_flags & IS_CALLABLE_CHECK_NO_ACCESS) == 0) {
 				if (fcc->function_handler->op_array.fn_flags & ZEND_ACC_PRIVATE) {
-					if (!zend_check_private(fcc->function_handler, fcc->object_pp ? Z_OBJCE_PP(fcc->object_pp) : EG(scope), mname, mlen TSRMLS_CC)) {
+					if (!zend_check_private(fcc->function_handler, fcc->object_pp ? Z_OBJCE_PP(fcc->object_pp) : EG(scope), lmname, lmlen TSRMLS_CC)) {
 						if (error) {
 							if (*error) {
 								efree(*error);
@@ -2963,6 +2962,8 @@ static int zend_is_callable_check_func(int check_flags, zval *callable, zend_fca
 			if (error) zend_spprintf(error, 0, "function '%R' does not exist", Z_TYPE_P(callable), mname);
 		}
 	}
+	efree(lmname.v);
+
 	if (fcc->object_pp) {
 		fcc->called_scope = Z_OBJCE_PP(fcc->object_pp);
 	}