Fallback to global namespace

Author: Girgias

Zend/zend_vm_def.h

@@ -3861,12 +3861,19 @@ ZEND_VM_HOT_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST, NUM|CACHE_SLOT)
 	fbc = CACHED_PTR(opline->result.num);
 	if (UNEXPECTED(fbc == NULL)) {
 		zval *function_name = (zval *)RT_CONSTANT(opline, opline->op2);
-		fbc = zend_lookup_function(Z_STR_P(function_name));
-		if (fbc == NULL) {
-			if (EXPECTED(!EG(exception))) {
+		fbc = zend_lookup_function(Z_STR_P(function_name)+1);
+		if (UNEXPECTED(fbc == NULL)) {
+			if (UNEXPECTED(EG(exception))) {
+				HANDLE_EXCEPTION();
+			}
+			/* Fallback onto global namespace */
+			fbc = zend_lookup_function(Z_STR_P(function_name)+2);
+			if (fbc == NULL) {
+				if (UNEXPECTED(EG(exception))) {
+					HANDLE_EXCEPTION();
+				}
 				ZEND_VM_DISPATCH_TO_HELPER(zend_undefined_function_helper);
 			}
-			HANDLE_EXCEPTION();
 		}
 		if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
 			init_func_run_time_cache(&fbc->op_array);

Zend/zend_vm_execute.h

@@ -3637,12 +3637,19 @@ static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_INIT_NS_FCALL_BY_N
 	fbc = CACHED_PTR(opline->result.num);
 	if (UNEXPECTED(fbc == NULL)) {
 		zval *function_name = (zval *)RT_CONSTANT(opline, opline->op2);
-		fbc = zend_lookup_function(Z_STR_P(function_name));
-		if (fbc == NULL) {
-			if (EXPECTED(!EG(exception))) {
+		fbc = zend_lookup_function(Z_STR_P(function_name)+1);
+		if (UNEXPECTED(fbc == NULL)) {
+			if (UNEXPECTED(EG(exception))) {
+				HANDLE_EXCEPTION();
+			}
+			/* Fallback onto global namespace */
+			fbc = zend_lookup_function(Z_STR_P(function_name)+2);
+			if (fbc == NULL) {
+				if (UNEXPECTED(EG(exception))) {
+					HANDLE_EXCEPTION();
+				}
 				ZEND_VM_TAIL_CALL(zend_undefined_function_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));
 			}
-			HANDLE_EXCEPTION();
 		}
 		if (EXPECTED(fbc->type == ZEND_USER_FUNCTION) && UNEXPECTED(!RUN_TIME_CACHE(&fbc->op_array))) {
 			init_func_run_time_cache(&fbc->op_array);