[Scummvm-git-logs] scummvm master -> 032846efc9de0ec2153fa6e8e6f36b8a1900a47b

[sluicebox]

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

Summary:
933a5a8f71 LILLIPUT: Fix memory leak in displayVGAFile. PVS-Studio V773
1a8386ae14 SHERLOCK: Fix memory leak on error. PVS-Studio V773
032846efc9 MADE: Add missing else keyword. PVS-Studio V646


Commit: 933a5a8f7123b10624b5b72be23d5834bf70a6e8
    https://github.com/scummvm/scummvm/commit/933a5a8f7123b10624b5b72be23d5834bf70a6e8
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-22T23:21:03-08:00

Commit Message:
LILLIPUT: Fix memory leak in displayVGAFile. PVS-Studio V773

Changed paths:
    engines/lilliput/lilliput.cpp


diff --git a/engines/lilliput/lilliput.cpp b/engines/lilliput/lilliput.cpp
index 79ed4fc388e..6f5e3ac0556 100644
--- a/engines/lilliput/lilliput.cpp
+++ b/engines/lilliput/lilliput.cpp
@@ -2616,6 +2616,7 @@ void LilliputEngine::displayVGAFile(Common::String fileName) {
 	memcpy(_mainSurface->getPixels(), buffer, 320*200);
 	_system->copyRectToScreen((byte *)_mainSurface->getPixels(), 320, 0, 0, 320, 200);
 	_system->updateScreen();
+	free(buffer);
 }
 
 void LilliputEngine::fixPaletteEntries(uint8 *palette, int num) {


Commit: 1a8386ae14009e374960d3d54943f8ab8a5ecd53
    https://github.com/scummvm/scummvm/commit/1a8386ae14009e374960d3d54943f8ab8a5ecd53
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-22T23:21:03-08:00

Commit Message:
SHERLOCK: Fix memory leak on error. PVS-Studio V773

Changed paths:
    engines/sherlock/scalpel/scalpel.cpp


diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp
index e396c498aec..b42c600ea6d 100644
--- a/engines/sherlock/scalpel/scalpel.cpp
+++ b/engines/sherlock/scalpel/scalpel.cpp
@@ -1280,6 +1280,7 @@ bool ScalpelEngine::play3doMovie(const Common::String &filename, const Common::P
 
 	if (!videoDecoder->loadFile(filename)) {
 		warning("Scalpel3DOMoviePlay: could not open '%s'", filename.c_str());
+		delete videoDecoder;
 		return false;
 	}
 


Commit: 032846efc9de0ec2153fa6e8e6f36b8a1900a47b
    https://github.com/scummvm/scummvm/commit/032846efc9de0ec2153fa6e8e6f36b8a1900a47b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-11-22T23:21:03-08:00

Commit Message:
MADE: Add missing else keyword. PVS-Studio V646

Changed paths:
    engines/made/scriptfuncs.cpp


diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index 195e1360b09..eb5e4d2e1eb 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -501,7 +501,7 @@ int16 ScriptFunctions::sfDrawText(int16 argc, int16 *argv) {
 
 	if (_vm->getGameID() == GID_RTZ) {
 		text = _vm->_dat->getObjectString(argv[argc - 1]);
-	} if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RODNEY) {
+	} else if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RODNEY) {
 		text = _vm->_dat->getString(argv[argc - 1]);
 	}