[Scummvm-git-logs] scummvm master -> 9cc03f1767f0ff0a7e7c7dcedd04661d8b7ef958

aquadran noreply at scummvm.org
Wed Jul 9 05:27:52 UTC 2025


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
9cc03f1767 WINTERMUTE: Silence xcode static analysis


Commit: 9cc03f1767f0ff0a7e7c7dcedd04661d8b7ef958
    https://github.com/scummvm/scummvm/commit/9cc03f1767f0ff0a7e7c7dcedd04661d8b7ef958
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-07-09T07:27:48+02:00

Commit Message:
WINTERMUTE: Silence xcode static analysis

Changed paths:
    engines/wintermute/base/file/base_disk_file.cpp


diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index c0f36a3b299..e5f5c178b9c 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -188,25 +188,25 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
 
 			byte *compBuffer = new byte[compSize];
 			if (!compBuffer) {
-				error("Error allocating memory for compressed file '%s'", filename.c_str());
 				delete file;
+				error("Error allocating memory for compressed file '%s'", filename.c_str());
 				return nullptr;
 			}
 
 			byte *data = new byte[uncompSize];
 			if (!data) {
-				error("Error allocating buffer for file '%s'", filename.c_str());
 				delete[] compBuffer;
 				delete file;
+				error("Error allocating buffer for file '%s'", filename.c_str());
 				return nullptr;
 			}
 			file->seek(dataOffset + prefixSize, SEEK_SET);
 			file->read(compBuffer, compSize);
 
 			if (Common::inflateZlib(data, &uncompSize, compBuffer, compSize) != true) {
-				error("Error uncompressing file '%s'", filename.c_str());
 				delete[] compBuffer;
 				delete file;
+				error("Error uncompressing file '%s'", filename.c_str());
 				return nullptr;
 			}
 




More information about the Scummvm-git-logs mailing list