[Scummvm-git-logs] scummvm master -> 5469bb5c62c85a668f0f4dfdb3a701992f2c2543

[Strangerke]

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

Summary:
9e5dbce7fb M4: Fix porential memory leak (CID 1591704 )
5469bb5c62 M4: Riddle: Remove commented code in room 204


Commit: 9e5dbce7fbadd70962b99b0ea30764f51b93d485
    https://github.com/scummvm/scummvm/commit/9e5dbce7fbadd70962b99b0ea30764f51b93d485
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-19T07:48:24+01:00

Commit Message:
M4: Fix porential memory leak (CID 1591704 )

Changed paths:
    engines/m4/fileio/fstream.cpp


diff --git a/engines/m4/fileio/fstream.cpp b/engines/m4/fileio/fstream.cpp
index bb1223344ea..8771450f342 100644
--- a/engines/m4/fileio/fstream.cpp
+++ b/engines/m4/fileio/fstream.cpp
@@ -157,6 +157,8 @@ got_mem:
 	if (fileOffset > 0) {
 		// If (fseek(newStream->srcFile, fileOffset, SEEK_SET) != 0) {
 		if (!newStream->srcFile->seek(fileOffset)) {
+			HUnLock(newStream->strmHandle);
+			DisposeHandle(newStream->strmHandle);
 			delete newStream->srcFile;
 			mem_free(newStream);
 			return nullptr;


Commit: 5469bb5c62c85a668f0f4dfdb3a701992f2c2543
    https://github.com/scummvm/scummvm/commit/5469bb5c62c85a668f0f4dfdb3a701992f2c2543
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2025-02-19T07:48:24+01:00

Commit Message:
M4: Riddle: Remove commented code in room 204

Changed paths:
    engines/m4/gui/gui_dialog.cpp


diff --git a/engines/m4/gui/gui_dialog.cpp b/engines/m4/gui/gui_dialog.cpp
index 4880fbfb904..53b8e8ebf1c 100644
--- a/engines/m4/gui/gui_dialog.cpp
+++ b/engines/m4/gui/gui_dialog.cpp
@@ -1319,8 +1319,7 @@ static void TextScrn_Show(void *s, void *r, void *b, int32 destX, int32 destY) {
 		while (myMatte) {
 			myGrBuff->refresh_video(myMatte->x1, myMatte->y1, myMatte->x1 - myScreen->x1, myMatte->y1 - myScreen->y1,
 				myMatte->x2 - myScreen->x1, myMatte->y2 - myScreen->y1);
-			//vmng_refresh_video(myMatte->x1, myMatte->y1, myMatte->x1 - myScreen->x1, myMatte->y1 - myScreen->y1,
-			//							myMatte->x2 - myScreen->x1, myMatte->y2 - myScreen->y1, myBuff);
+
 			myMatte = myMatte->nextMatte;
 		}
 	} else {