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

sluicebox noreply at scummvm.org
Sun Sep 14 20:24:13 UTC 2025 

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

Summary:
bb9b4434e7 ALCACHOFA: Fix memory leak. PVS-Studio V773
c1b52fc1c5 SHERLOCK: Fix memory leak. PVS-Studio V773
d60721da84 SLUDGE: Remove `delete nullptr`. PVS-Studio V575
d1240b64ad TEENAGENT: Fix `warning` parameters. PVS-Studio V576
723ce9aeb2 ZVISION: Fix memory leak. PVS-Studio V773
be553aca59 ZVISION: Remove identical expressions. PVS-Studio V501


Commit: bb9b4434e7f9f59dfddecb09103deb6be1e0ec5b
    https://github.com/scummvm/scummvm/commit/bb9b4434e7f9f59dfddecb09103deb6be1e0ec5b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-09-14T13:23:21-07:00

Commit Message:
ALCACHOFA: Fix memory leak. PVS-Studio V773

Changed paths:
    engines/alcachofa/alcachofa.cpp


diff --git a/engines/alcachofa/alcachofa.cpp b/engines/alcachofa/alcachofa.cpp
index dc26d582dde..2bb9096fe41 100644
--- a/engines/alcachofa/alcachofa.cpp
+++ b/engines/alcachofa/alcachofa.cpp
@@ -140,6 +140,7 @@ void AlcachofaEngine::playVideo(int32 videoId) {
 	FakeLock lock("playVideo", _eventLoopSemaphore);
 	File *file = new File();
 	if (!file->open(Path(Common::String::format("Data/DATA%02d.BIN", videoId + 1)))) {
+		delete file;
 		game().invalidVideo(videoId, "open file");
 		return;
 	}


Commit: c1b52fc1c5b4280b3865da7e89a488e71f88cd95
    https://github.com/scummvm/scummvm/commit/c1b52fc1c5b4280b3865da7e89a488e71f88cd95
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-09-14T13:23:21-07:00

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

See: 369ef801c094d5e158e12e003393b1cc18892c58

Changed paths:
    engines/sherlock/metaengine.cpp


diff --git a/engines/sherlock/metaengine.cpp b/engines/sherlock/metaengine.cpp
index 8427b848113..aa5136ce83a 100644
--- a/engines/sherlock/metaengine.cpp
+++ b/engines/sherlock/metaengine.cpp
@@ -744,6 +744,7 @@ Common::KeymapArray SherlockMetaEngine::initKeymaps(const char *target) const {
 		keymaps.push_back(scalpelScrollKeymap);
 		keymaps.push_back(animationKeymap);
 		keymaps.push_back(scalpelKeymap);
+		keymaps.push_back(scalpelDartsKeymap);
 		keymaps.push_back(scalpelJournalKeymap);
 		keymaps.push_back(scalpelTalkKeymap);
 		keymaps.push_back(scalpelInvKeymap);
@@ -754,6 +755,7 @@ Common::KeymapArray SherlockMetaEngine::initKeymaps(const char *target) const {
 
 		scalpelScrollKeymap->setEnabled(false);
 		animationKeymap->setEnabled(false);
+		scalpelDartsKeymap->setEnabled(false);
 		scalpelJournalKeymap->setEnabled(false);
 		scalpelTalkKeymap->setEnabled(false);
 		scalpelInvKeymap->setEnabled(false);


Commit: d60721da84c0221039043412ca934945bead0b14
    https://github.com/scummvm/scummvm/commit/d60721da84c0221039043412ca934945bead0b14
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-09-14T13:23:21-07:00

Commit Message:
SLUDGE: Remove `delete nullptr`. PVS-Studio V575

Changed paths:
    engines/sludge/savedata.cpp


diff --git a/engines/sludge/savedata.cpp b/engines/sludge/savedata.cpp
index 547041995ff..c312dc8c5f7 100644
--- a/engines/sludge/savedata.cpp
+++ b/engines/sludge/savedata.cpp
@@ -104,7 +104,6 @@ bool CustomSaveHelper::fileToStack(const Common::String &filename, StackHandler
 
 	if (fp == NULL) {
 		// Try looking inside game folder
-		delete fp;
 		Common::File *f = new Common::File();
 		if (!f->open(Common::Path(filename)))
 			return fatal("No such file", filename); //TODO: false value


Commit: d1240b64ad43e0b8e0ae08d6e1631a06ede4552b
    https://github.com/scummvm/scummvm/commit/d1240b64ad43e0b8e0ae08d6e1631a06ede4552b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-09-14T13:23:21-07:00

Commit Message:
TEENAGENT: Fix `warning` parameters. PVS-Studio V576

Changed paths:
    engines/teenagent/resources.cpp


diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp
index fca70d1457e..c3341a00ed3 100644
--- a/engines/teenagent/resources.cpp
+++ b/engines/teenagent/resources.cpp
@@ -338,7 +338,7 @@ bool Resources::loadArchives(const ADGameDescription *gd) {
 		const char *msg = _s("Incorrect version of the '%s' engine data file found. Expected %d but got %d.");
 		Common::U32String errorMessage = Common::U32String::format(_(msg), filename.c_str(), TEENAGENT_DAT_VERSION, version);
 		GUIErrorMessage(errorMessage);
-		warning(msg, filename.c_str());
+		warning(msg, filename.c_str(), TEENAGENT_DAT_VERSION, version);
 		return false;
 	}
 


Commit: 723ce9aeb2a3b1e7a2396966f2f95e6e9baf91a4
    https://github.com/scummvm/scummvm/commit/723ce9aeb2a3b1e7a2396966f2f95e6e9baf91a4
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-09-14T13:23:21-07:00

Commit Message:
ZVISION: Fix memory leak. PVS-Studio V773

Changed paths:
    engines/zvision/core/console.cpp


diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
index 0d773d5223d..972c36227b9 100644
--- a/engines/zvision/core/console.cpp
+++ b/engines/zvision/core/console.cpp
@@ -82,6 +82,7 @@ bool Console::cmdLoadSound(int argc, const char **argv) {
 		Common::File *file = new Common::File();
 		if (!file->open(argv[1])) {
 			warning("File not found: %s", argv[1]);
+			delete file;
 			return true;
 		}
 


Commit: be553aca596e54256783c3a7c4948fd2ca19bb71
    https://github.com/scummvm/scummvm/commit/be553aca596e54256783c3a7c4948fd2ca19bb71
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2025-09-14T13:23:21-07:00

Commit Message:
ZVISION: Remove identical expressions. PVS-Studio V501

Introduced in 95440c2bf145f8cb9529761e04632691fb635f62

Changed paths:
    engines/zvision/text/truetype_font.cpp


diff --git a/engines/zvision/text/truetype_font.cpp b/engines/zvision/text/truetype_font.cpp
index d0e6064e7e6..7a342596f38 100644
--- a/engines/zvision/text/truetype_font.cpp
+++ b/engines/zvision/text/truetype_font.cpp
@@ -110,8 +110,8 @@ bool StyledTTFont::loadFont(const Common::String &fontName, int32 point, uint st
 
 	Common::File *file = new Common::File();
 	Graphics::Font *newFont;
-	if (!file->open(Common::Path(newFontName)) && !file->open(Common::Path(newFontName)) &&
-	        !file->open(Common::Path(liberationFontName)) && !file->open(Common::Path(liberationFontName))) {
+	if (!file->open(Common::Path(newFontName)) &&
+	        !file->open(Common::Path(liberationFontName))) {
 		newFont = Graphics::loadTTFFontFromArchive(liberationFontName, point, Graphics::kTTFSizeModeCell, 0, 0, (sharp ? Graphics::kTTFRenderModeMonochrome : Graphics::kTTFRenderModeNormal));
 		delete file;
 	} else {

More information about the Scummvm-git-logs mailing list