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

[dwatteau]

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

Summary:
cbfa856ebc SCUMM: Fix -Wformat-overflow warning in Insane::smush_setFrameSteps()


Commit: cbfa856ebc7f466fe7ba5c60823b789088eba258
    https://github.com/scummvm/scummvm/commit/cbfa856ebc7f466fe7ba5c60823b789088eba258
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-05T21:38:02+01:00

Commit Message:
SCUMM: Fix -Wformat-overflow warning in Insane::smush_setFrameSteps()

It's given a null pointer at some point, which is UB for printf-like
functions.

Changed paths:
    engines/scumm/insane/insane.cpp


diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index f4f0444d03f..7dfb8d13d0c 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -879,7 +879,7 @@ void Insane::smush_rewindCurrentSan(int arg_0, int arg_4, int arg_8) {
 	debugC(DEBUG_INSANE, "smush_rewindCurrentSan(%d, %d, %d)", arg_0, arg_4, arg_8);
 	_smush_setupsan2 = arg_0;
 
-	smush_setupSanFile(0, 0, 0);
+	smush_setupSanFile(nullptr, 0, 0);
 	_smush_isSanFileSetup = 1;
 	smush_setFrameSteps(arg_4, arg_8);
 
@@ -1474,7 +1474,7 @@ void Insane::smush_setFrameSteps(int32 step1, int32 step2) {
 }
 
 void Insane::smush_setupSanFile(const char *filename, int32 offset, int32 contFrame) {
-	debugC(DEBUG_INSANE, "Insane::smush_setupSanFile(%s, %x, %d)", filename, offset, contFrame);
+	debugC(DEBUG_INSANE, "Insane::smush_setupSanFile(%s, %x, %d)", (filename ? filename : "(null)"), offset, contFrame);
 
 	_player->seekSan(filename, offset, contFrame);
 }