[Scummvm-git-logs] scummvm master -> d04812b7adb350f442948e5e24f5ee3540604a71

sluicebox noreply at scummvm.org
Wed Nov 22 23:56:17 UTC 2023


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:
dbd3e34ad6 TINSEL: Fix out of bounds array access
d04812b7ad AGS: Fix memory leak when playing video


Commit: dbd3e34ad6dcb8e074f5f2e913f173a49ab64e73
    https://github.com/scummvm/scummvm/commit/dbd3e34ad6dcb8e074f5f2e913f173a49ab64e73
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-22T15:28:42-08:00

Commit Message:
TINSEL: Fix out of bounds array access

Coverity CID 1527289

Changed paths:
    engines/tinsel/events.cpp


diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp
index 2a34183b211..2421f7eef85 100644
--- a/engines/tinsel/events.cpp
+++ b/engines/tinsel/events.cpp
@@ -421,7 +421,7 @@ void PlayerEvent(PLR_EVENT pEvent, const Common::Point &coOrds) {
 		"PLR_MENU", "PLR_QUIT", "PLR_PGUP", "PLR_PGDN", "PLR_HOME", "PLR_END",
 		"PLR_DRAG1_START", "PLR_DRAG1_END", "PLR_DRAG2_START", "PLR_DRAG2_END",
 		"PLR_JUMP", "PLR_NOEVENT", "PLR_SAVE", "PLR_LOAD", "PLR_WHEEL_UP",
-		"PLR_WHEEL_DOWN"};
+		"PLR_WHEEL_DOWN", "PLR_INVENTORY", "PLR_NOTEBOOK" };
 	debugC(DEBUG_BASIC, kTinselDebugActions, "%s - (%d,%d)",
 		actionList[pEvent], coOrds.x, coOrds.y);
 


Commit: d04812b7adb350f442948e5e24f5ee3540604a71
    https://github.com/scummvm/scummvm/commit/d04812b7adb350f442948e5e24f5ee3540604a71
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-22T15:49:16-08:00

Commit Message:
AGS: Fix memory leak when playing video

Coverity CID 1523839

Changed paths:
    engines/ags/engine/ac/global_video.cpp


diff --git a/engines/ags/engine/ac/global_video.cpp b/engines/ags/engine/ac/global_video.cpp
index 6d046ac4cd7..89be63820ab 100644
--- a/engines/ags/engine/ac/global_video.cpp
+++ b/engines/ags/engine/ac/global_video.cpp
@@ -210,6 +210,8 @@ void pause_sound_if_necessary_and_play_video(const char *name, int flags, VideoS
 					_GP(ambient)[i].vol, _GP(ambient)[i].x, _GP(ambient)[i].y);
 		}
 	}
+
+	free(filename);
 }
 
 #else




More information about the Scummvm-git-logs mailing list