Patch bug54346.diff for *General Issues Bug #64346

Patch version 2013-03-04 13:25 UTC

• 2013-03-04 13:25 UTC [diff to current]

Developer: dmitry@zend.com

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index e5cdd1d..9db0bd5 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2479,7 +2479,10 @@ ZEND_VM_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST)
 			SAVE_OPLINE();
 			zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(opline->op2.zv));
 		} else {
+			/* Caching Disabled, because a function with the same name may be
+			   created in the namespace later (see bug #64346)
 			CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));
+			*/
 		}
 	} else {
 		CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 97e5a8e..9980039 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -1335,7 +1335,10 @@ static int ZEND_FASTCALL  ZEND_INIT_NS_FCALL_BY_NAME_SPEC_CONST_HANDLER(ZEND_OPC
 			SAVE_OPLINE();
 			zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(opline->op2.zv));
 		} else {
+			/* Caching Disabled, because a function with the same name may be
+			   created in the namespace later (see bug #64346)
 			CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));
+			*/
 		}
 	} else {
 		CACHE_PTR(opline->op2.literal->cache_slot, EX(fbc));