[Scummvm-git-logs] scummvm master -> 17ea883ea57bb5b0b43f9bf68f3bc1a64501d158

[aquadran]

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:
17ea883ea5 WINTERMUTE: Improve code for handling null entries in package


Commit: 17ea883ea57bb5b0b43f9bf68f3bc1a64501d158
    https://github.com/scummvm/scummvm/commit/17ea883ea57bb5b0b43f9bf68f3bc1a64501d158
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-10-16T17:36:57+02:00

Commit Message:
WINTERMUTE: Improve code for handling null entries in package

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


diff --git a/engines/wintermute/base/file/base_package.cpp b/engines/wintermute/base/file/base_package.cpp
index 05bd5fbb519..10300f1947b 100644
--- a/engines/wintermute/base/file/base_package.cpp
+++ b/engines/wintermute/base/file/base_package.cpp
@@ -183,6 +183,9 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 			uint32 offset, length, compLength, flags;/*, timeDate1, timeDate2;*/
 
 			nameLength = stream->readByte();
+			// WME 2D Technology Demo has null name entries
+			if (nameLength == 0)
+				continue;
 			name = new char[nameLength];
 			stream->read(name, nameLength);
 
@@ -194,11 +197,7 @@ PackageSet::PackageSet(Common::FSNode file, const Common::String &filename, bool
 			}
 			debugC(kWintermuteDebugFileAccess, "Package contains %s", name);
 
-			Common::Path path;
-
-			// WME 2D Technology Demo has null name entries
-			if (nameLength != 0)
-				path = Common::Path(name, '\\');
+			Common::Path path(name, '\\');
 
 			delete[] name;
 			name = nullptr;