From 655d249ac98b8f8d377526535da43b71c8136437 Mon Sep 17 00:00:00 2001
From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 30 May 2018 18:24:31 +0300
Subject: [PATCH] Eliminate some checks for zero character inside an inclue
 file name

---
 Zend/zend_execute.c | 113 +++++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index fb6e07ee21..bd9fcce771 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -3080,70 +3080,75 @@ static zend_never_inline zend_op_array* ZEND_FASTCALL zend_include_or_eval(zval
 		inc_filename = &tmp_inc_filename;
 	}
 
-	if (type != ZEND_EVAL && strlen(Z_STRVAL_P(inc_filename)) != Z_STRLEN_P(inc_filename)) {
-		if (type == ZEND_INCLUDE_ONCE || type == ZEND_INCLUDE) {
-			zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename));
-		} else {
-			zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
-		}
-	} else {
-		switch (type) {
-			case ZEND_INCLUDE_ONCE:
-			case ZEND_REQUIRE_ONCE: {
-					zend_file_handle file_handle;
-					zend_string *resolved_path;
-
-					resolved_path = zend_resolve_path(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename));
-					if (resolved_path) {
-						if (zend_hash_exists(&EG(included_files), resolved_path)) {
-							goto already_compiled;
-						}
-					} else {
-						resolved_path = zend_string_copy(Z_STR_P(inc_filename));
+	switch (type) {
+		case ZEND_INCLUDE_ONCE:
+		case ZEND_REQUIRE_ONCE: {
+				zend_file_handle file_handle;
+				zend_string *resolved_path;
+
+				resolved_path = zend_resolve_path(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename));
+				if (EXPECTED(resolved_path)) {
+					if (zend_hash_exists(&EG(included_files), resolved_path)) {
+						goto already_compiled;
 					}
+				} else if (UNEXPECTED(strlen(Z_STRVAL_P(inc_filename)) != Z_STRLEN_P(inc_filename))) {
+					zend_message_dispatcher(
+						(type == ZEND_INCLUDE_ONCE) ?
+							ZMSG_FAILED_INCLUDE_FOPEN : ZMSG_FAILED_REQUIRE_FOPEN,
+							Z_STRVAL_P(inc_filename));
+					break;
+				} else {
+					resolved_path = zend_string_copy(Z_STR_P(inc_filename));
+				}
 
-					if (SUCCESS == zend_stream_open(ZSTR_VAL(resolved_path), &file_handle)) {
+				if (SUCCESS == zend_stream_open(ZSTR_VAL(resolved_path), &file_handle)) {
 
-						if (!file_handle.opened_path) {
-							file_handle.opened_path = zend_string_copy(resolved_path);
-						}
+					if (!file_handle.opened_path) {
+						file_handle.opened_path = zend_string_copy(resolved_path);
+					}
 
-						if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path)) {
-							zend_op_array *op_array = zend_compile_file(&file_handle, (type==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE));
-							zend_destroy_file_handle(&file_handle);
-							zend_string_release_ex(resolved_path, 0);
-							if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {
-								zend_string_release_ex(Z_STR(tmp_inc_filename), 0);
-							}
-							return op_array;
-						} else {
-							zend_file_handle_dtor(&file_handle);
-already_compiled:
-							new_op_array = ZEND_FAKE_OP_ARRAY;
+					if (zend_hash_add_empty_element(&EG(included_files), file_handle.opened_path)) {
+						zend_op_array *op_array = zend_compile_file(&file_handle, (type==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE));
+						zend_destroy_file_handle(&file_handle);
+						zend_string_release_ex(resolved_path, 0);
+						if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {
+							zend_string_release_ex(Z_STR(tmp_inc_filename), 0);
 						}
+						return op_array;
 					} else {
-						if (type == ZEND_INCLUDE_ONCE) {
-							zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename));
-						} else {
-							zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename));
-						}
+						zend_file_handle_dtor(&file_handle);
+already_compiled:
+						new_op_array = ZEND_FAKE_OP_ARRAY;
 					}
-					zend_string_release_ex(resolved_path, 0);
-				}
-				break;
-			case ZEND_INCLUDE:
-			case ZEND_REQUIRE:
-				new_op_array = compile_filename(type, inc_filename);
-				break;
-			case ZEND_EVAL: {
-					char *eval_desc = zend_make_compiled_string_description("eval()'d code");
-					new_op_array = zend_compile_string(inc_filename, eval_desc);
-					efree(eval_desc);
+				} else {
+					zend_message_dispatcher(
+						(type == ZEND_INCLUDE_ONCE) ?
+							ZMSG_FAILED_INCLUDE_FOPEN : ZMSG_FAILED_REQUIRE_FOPEN,
+							Z_STRVAL_P(inc_filename));
 				}
+				zend_string_release_ex(resolved_path, 0);
+			}
+			break;
+		case ZEND_INCLUDE:
+		case ZEND_REQUIRE:
+			if (UNEXPECTED(strlen(Z_STRVAL_P(inc_filename)) != Z_STRLEN_P(inc_filename))) {
+				zend_message_dispatcher(
+					(type == ZEND_INCLUDE) ?
+						ZMSG_FAILED_INCLUDE_FOPEN : ZMSG_FAILED_REQUIRE_FOPEN,
+						Z_STRVAL_P(inc_filename));
 				break;
-			EMPTY_SWITCH_DEFAULT_CASE()
-		}
+			}
+			new_op_array = compile_filename(type, inc_filename);
+			break;
+		case ZEND_EVAL: {
+				char *eval_desc = zend_make_compiled_string_description("eval()'d code");
+				new_op_array = zend_compile_string(inc_filename, eval_desc);
+				efree(eval_desc);
+			}
+			break;
+		EMPTY_SWITCH_DEFAULT_CASE()
 	}
+
 	if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {
 		zend_string_release_ex(Z_STR(tmp_inc_filename), 0);
 	}
-- 
2.40.0