[Scummvm-git-logs] scummvm master -> 127445a1a7114dff75df20bb9c8f9a3a1e655684

neuromancer noreply at scummvm.org
Wed Nov 4 18:35:15 UTC 2026


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

Summary:
1ec7a82da1 HOLLYWOOD: fixes for coverity 1690064, 1690108, and 1690112
59e30fcb6c HOLLYWOOD: check if samples was allocated. PVS-Studio V575
127445a1a7 HOLLYWOOD: explicit initialization of arrays in constructors. PVS-Studio V730


Commit: 1ec7a82da1eb4c4a65053176445b1d15339b2395
    https://github.com/scummvm/scummvm/commit/1ec7a82da1eb4c4a65053176445b1d15339b2395
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T19:34:56+01:00

Commit Message:
HOLLYWOOD: fixes for coverity 1690064, 1690108, and 1690112

Changed paths:
    engines/hollywood/monsters/scenes/playable/scene1050.cpp
    engines/hollywood/monsters/scenes/playable/scene2020.cpp
    engines/hollywood/monsters/scenes/playable/scene5050.cpp


diff --git a/engines/hollywood/monsters/scenes/playable/scene1050.cpp b/engines/hollywood/monsters/scenes/playable/scene1050.cpp
index 857b604c537..0ff74ac5f7d 100644
--- a/engines/hollywood/monsters/scenes/playable/scene1050.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene1050.cpp
@@ -308,12 +308,16 @@ void Scene1050::runCloakroomAttendantConversation() {
 
 	beginSecondarySpeechLine(kScene1050DialogueStageId, firstConversation ? 0 : 1);
 	beginCloakroomAttendantSpeechLine(firstConversation ? 0 : 1, _random.getRandomBit() != 0);
+	if (animationPlaybackShouldStop())
+		return;
 	state.scene1050CloakroomAttendantConversationSeen = true;
 	applySceneStateToHotspotsAndPatches(1);
 
-	while (!finished && !Engine::shouldQuit()) {
+	while (!finished && !animationPlaybackShouldStop()) {
 		DialogueMenu menu(_vm, this);
 		const byte selectedChoice = menu.choose(kScene1050DialogueStageId, records, depthIndex, nodeIndex);
+		if (animationPlaybackShouldStop())
+			return;
 		if (selectedChoice == DialogueMenu::kCancelledChoice) {
 			beginSecondarySpeechLine(kScene1050DialogueStageId, 7);
 			beginCloakroomAttendantSpeechLine(7, _random.getRandomBit() != 0);
@@ -329,6 +333,8 @@ void Scene1050::runCloakroomAttendantConversation() {
 		if (record.responseFrameIndex != 0 && record.responseFrameIndex != 0xff)
 			beginCloakroomAttendantSpeechLine(record.responseFrameIndex, _random.getRandomBit() != 0);
 
+		if (animationPlaybackShouldStop())
+			return;
 		handleDialogueEffect(record.disableAfterUse);
 		if (record.disableAfterUse != 0)
 			record.enabled = 0;
@@ -526,6 +532,8 @@ void Scene1050::runTravelUnlockEffect(byte destinationId) {
 		.actorReplacement(13, kScene1050TravelOverlayDescriptorCount,
 			kTravelUnlockFrames, kTravelUnlockFrameCount, kScene1050FrameMillis)
 		.stopSound();
+	if (animationPlaybackShouldStop())
+		return;
 	unlockTravelDestination(destinationId);
 }
 
diff --git a/engines/hollywood/monsters/scenes/playable/scene2020.cpp b/engines/hollywood/monsters/scenes/playable/scene2020.cpp
index f09da989330..37c57b78470 100644
--- a/engines/hollywood/monsters/scenes/playable/scene2020.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene2020.cpp
@@ -658,6 +658,8 @@ void Scene2020::runPrincessSpeechTransition(bool opening) {
 
 void Scene2020::beginPrincessSpeechLine(byte frameIndex) {
 	runPrincessSpeechTransition(true);
+	if (animationPlaybackShouldStop())
+		return;
 	beginPrimarySpeechLineWithAnimationGroup(kScene2020PrincessDialoguePrimaryRow, frameIndex,
 		0x00ab, 0x00e5, 0x3f, 0x20, 0x34, 0);
 	runPrincessSpeechTransition(false);
@@ -672,6 +674,8 @@ void Scene2020::runPrincessDialogue() {
 		for (byte frame = 0; frame < 3; ++frame) {
 			beginSecondarySpeechLine(kScene2020PrincessDialogueStageId, frame);
 			beginPrincessSpeechLine(frame);
+			if (animationPlaybackShouldStop())
+				return;
 		}
 		state.scene2020PrincessConversationSeen = true;
 	} else {
diff --git a/engines/hollywood/monsters/scenes/playable/scene5050.cpp b/engines/hollywood/monsters/scenes/playable/scene5050.cpp
index 1ccdd793faf..1ddfba7f002 100644
--- a/engines/hollywood/monsters/scenes/playable/scene5050.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene5050.cpp
@@ -224,7 +224,8 @@ void Scene5050::setPrimarySpeechAnimationFrame(byte animationGroup, byte frameIn
 void Scene5050::runSpecialTransitionToMineSwitches() {
 	setActiveActorPose(0x069, 0x157, 2);
 	drawPlayableComposite();
-	fadePaletteFromBlack();
+	if (fadePaletteFromBlack())
+		return;
 
 	_specialTransitionActive = true;
 	runActorReplacement(ActionOverlaySpec(7, kScene5050SpecialTransitionDescriptorCount,
@@ -232,7 +233,8 @@ void Scene5050::runSpecialTransitionToMineSwitches() {
 		.hookAt(14, kScene5050SpecialHoldHook)
 		.noFinalFrameDelay());
 	_specialTransitionActive = false;
-	fadePaletteToBlack();
+	if (fadePaletteToBlack())
+		return;
 	_specialExitAlreadyFaded = true;
 
 	GameplayState &state = _vm->gameState();


Commit: 59e30fcb6c9a16adb539aaffe92ce8f88ca5733d
    https://github.com/scummvm/scummvm/commit/59e30fcb6c9a16adb539aaffe92ce8f88ca5733d
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T19:34:56+01:00

Commit Message:
HOLLYWOOD: check if samples was allocated. PVS-Studio V575

Changed paths:
    engines/hollywood/runaway/audio.cpp


diff --git a/engines/hollywood/runaway/audio.cpp b/engines/hollywood/runaway/audio.cpp
index 946296c3412..61517f47ca5 100644
--- a/engines/hollywood/runaway/audio.cpp
+++ b/engines/hollywood/runaway/audio.cpp
@@ -131,6 +131,10 @@ void RunawayAudio::playPointer() {
 	if (!readRunawayGlobalChunk(150, data) || data.size() % 2)
 		return;
 	byte *samples = (byte *)malloc(data.size());
+	if (!samples) {
+		warning("Runaway demo: cannot allocate pointer sound buffer");
+		return;
+	}
 	memcpy(samples, data.data(), data.size());
 	_mixer->stopHandle(_pointer);
 	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_pointer,


Commit: 127445a1a7114dff75df20bb9c8f9a3a1e655684
    https://github.com/scummvm/scummvm/commit/127445a1a7114dff75df20bb9c8f9a3a1e655684
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-11-04T19:34:56+01:00

Commit Message:
HOLLYWOOD: explicit initialization of arrays in constructors. PVS-Studio V730

Changed paths:
    engines/hollywood/monsters/scenes/playable/scene8010.cpp
    engines/hollywood/runaway/scene5030.h


diff --git a/engines/hollywood/monsters/scenes/playable/scene8010.cpp b/engines/hollywood/monsters/scenes/playable/scene8010.cpp
index ea45146712e..67c5dc4c50f 100644
--- a/engines/hollywood/monsters/scenes/playable/scene8010.cpp
+++ b/engines/hollywood/monsters/scenes/playable/scene8010.cpp
@@ -135,6 +135,7 @@ Scene8010::Scene8010(HollywoodEngine *vm) :
 		_secondaryAmbientChannel(),
 		_fishermanQuizEntries(),
 		_fishermanQuizFinalEntry(),
+		_fishermanQuizChoiceEntryIndex(),
 		_fishermanState(0),
 		_fishermanRepeatCount(0),
 		_previousSecondaryAmbientCue(0),
diff --git a/engines/hollywood/runaway/scene5030.h b/engines/hollywood/runaway/scene5030.h
index aae14b758bc..d2391519d0e 100644
--- a/engines/hollywood/runaway/scene5030.h
+++ b/engines/hollywood/runaway/scene5030.h
@@ -45,7 +45,7 @@ public:
 	};
 
 	RunawayScene5030(Audio::Mixer *mixer, RunawayInventory &inventory, const RunawayStrings &strings) :
-		_audio(mixer), _inventory(inventory), _strings(strings), _interrogation(mixer), _random("runawayShack") {}
+		_audio(mixer), _inventory(inventory), _strings(strings), _interrogation(mixer), _random("runawayShack"), _actor() {}
 	bool load();
 	void start(uint32 now);
 	void click(Common::Point mouse, RunawayVerb verb, byte item);




More information about the Scummvm-git-logs mailing list