[Scummvm-git-logs] scummvm branch-2-9 -> 4490d2a5ac1326bc785a5070f2e3bd3a01464aab

[antoniou79]

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

Summary:
9fab313f13 BLADERUNNER: Check for failed malloc for thumbnail data
4490d2a5ac BLADERUNNER: Use assert for failed malloc for thumbnail data


Commit: 9fab313f13888bf1a33cc35536e48f18b57c2af3
    https://github.com/scummvm/scummvm/commit/9fab313f13888bf1a33cc35536e48f18b57c2af3
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-04-29T14:30:51+03:00

Commit Message:
BLADERUNNER: Check for failed malloc for thumbnail data

Changed paths:
    engines/bladerunner/savefile.cpp


diff --git a/engines/bladerunner/savefile.cpp b/engines/bladerunner/savefile.cpp
index 5a10db6b643..d01c8220a31 100644
--- a/engines/bladerunner/savefile.cpp
+++ b/engines/bladerunner/savefile.cpp
@@ -154,12 +154,13 @@ bool SaveFileManager::readHeader(Common::SeekableReadStream &in, SaveFileHeader
 		} else {
 			uint16 alphamask = (0xFF >> gameDataPixelFormat().aLoss) << gameDataPixelFormat().aShift;
 			uint16 *thumbnailData = (uint16*)malloc(kThumbnailSize); // freed by ScummVM's smartptr
-			for (uint i = 0; i < kThumbnailSize / 2; ++i) {
-				thumbnailData[i] = s.readUint16LE() | alphamask; // We set all pixels to non-transparency
+			if (thumbnailData) {
+				for (uint i = 0; i < kThumbnailSize / 2; ++i) {
+					thumbnailData[i] = s.readUint16LE() | alphamask; // We set all pixels to non-transparency
+				}
+				header._thumbnail = new Graphics::Surface();
+				header._thumbnail->init(80, 60, 160, thumbnailData, gameDataPixelFormat());
 			}
-
-			header._thumbnail = new Graphics::Surface(); // freed by ScummVM's smartptr
-			header._thumbnail->init(80, 60, 160, thumbnailData, gameDataPixelFormat());
 		}
 
 		s.seek(pos);


Commit: 4490d2a5ac1326bc785a5070f2e3bd3a01464aab
    https://github.com/scummvm/scummvm/commit/4490d2a5ac1326bc785a5070f2e3bd3a01464aab
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2025-04-29T14:31:00+03:00

Commit Message:
BLADERUNNER: Use assert for failed malloc for thumbnail data

Instead of check for nullptr

Changed paths:
    engines/bladerunner/savefile.cpp


diff --git a/engines/bladerunner/savefile.cpp b/engines/bladerunner/savefile.cpp
index d01c8220a31..392bb5a8fcb 100644
--- a/engines/bladerunner/savefile.cpp
+++ b/engines/bladerunner/savefile.cpp
@@ -154,13 +154,13 @@ bool SaveFileManager::readHeader(Common::SeekableReadStream &in, SaveFileHeader
 		} else {
 			uint16 alphamask = (0xFF >> gameDataPixelFormat().aLoss) << gameDataPixelFormat().aShift;
 			uint16 *thumbnailData = (uint16*)malloc(kThumbnailSize); // freed by ScummVM's smartptr
-			if (thumbnailData) {
-				for (uint i = 0; i < kThumbnailSize / 2; ++i) {
-					thumbnailData[i] = s.readUint16LE() | alphamask; // We set all pixels to non-transparency
-				}
-				header._thumbnail = new Graphics::Surface();
-				header._thumbnail->init(80, 60, 160, thumbnailData, gameDataPixelFormat());
+			assert(thumbnailData);
+
+			for (uint i = 0; i < kThumbnailSize / 2; ++i) {
+				thumbnailData[i] = s.readUint16LE() | alphamask; // We set all pixels to non-transparency
 			}
+			header._thumbnail = new Graphics::Surface();
+			header._thumbnail->init(80, 60, 160, thumbnailData, gameDataPixelFormat());
 		}
 
 		s.seek(pos);