Merge pull request #60310 from HookJabs/unz_file_read_failure

editor/export_template_manager.cpp

@@ -404,9 +404,7 @@ bool ExportTemplateManager::_install_file_selected(const String &p_file, bool p_
 			// Read.
 			unzOpenCurrentFile(pkg);
 			ret = unzReadCurrentFile(pkg, data.ptrw(), data.size());
-			if (ret != UNZ_OK) {
-				break;
-			}
+			ERR_BREAK_MSG(ret < 0, vformat("An error occurred while attempting to read from file: %s. This file will not be used.", file));
 			unzCloseCurrentFile(pkg);
 
 			String data_str;
@@ -478,9 +476,7 @@ bool ExportTemplateManager::_install_file_selected(const String &p_file, bool p_
 		// Read
 		unzOpenCurrentFile(pkg);
 		ret = unzReadCurrentFile(pkg, data.ptrw(), data.size());
-		if (ret != UNZ_OK) {
-			break;
-		}
+		ERR_BREAK_MSG(ret < 0, vformat("An error occurred while attempting to read from file: %s. This file will not be used.", file));
 		unzCloseCurrentFile(pkg);
 
 		String base_dir = file_path.get_base_dir().trim_suffix("/");

editor/project_manager.cpp

@@ -557,9 +557,7 @@ private:
 							//read
 							unzOpenCurrentFile(pkg);
 							ret = unzReadCurrentFile(pkg, data.ptrw(), data.size());
-							if (ret != UNZ_OK) {
-								break;
-							}
+							ERR_BREAK_MSG(ret < 0, vformat("An error occurred while attempting to read from file: %s. This file will not be used.", rel_path));
 							unzCloseCurrentFile(pkg);
 
 							Ref<FileAccess> f = FileAccess::open(dir.plus_file(rel_path), FileAccess::WRITE);