[Scummvm-git-logs] scummvm master -> 5d4baa980ede14427d010122005a958630ca5897

[athrxx]

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:
5d4baa980e KYRA: Fix pointless NULL validation


Commit: 5d4baa980ede14427d010122005a958630ca5897
    https://github.com/scummvm/scummvm/commit/5d4baa980ede14427d010122005a958630ca5897
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2022-06-03T02:12:46+02:00

Commit Message:
KYRA: Fix pointless NULL validation

Reported by GCC 12:
../scummvm/engines/kyra/script/script_hof.cpp: In member function 'int Kyra::KyraEngine_HoF::o2_defineSceneAnim(Kyra::EMCState*)':
../scummvm/engines/kyra/script/script_hof.cpp:875:32: warning: comparing the result of pointer addition '(((const char*)script->Kyra::EMCState::dataPtr->Kyra::EMCData::text) + ((sizetype)READ_BE_UINT16((((const void*)script->Kyra::EMCState::dataPtr->Kyra::EMCData::text) + ((sizetype)(((int)((Kyra::KyraEngine_HoF*)this)->Kyra::KyraEngine_HoF::<anonymous>.Kyra::KyraEngine_v2::<anonymous>.Kyra::KyraEngine_v1::emcSafeReadStack(script, 12, 875, ((const char*)"../scummvm/engines/kyra/script/script_hof.cpp"))) << 1))))))' and NULL [-Waddress]
  875 |         if (stackPosString(12) != nullptr)

Changed paths:
    engines/kyra/script/script_hof.cpp


diff --git a/engines/kyra/script/script_hof.cpp b/engines/kyra/script/script_hof.cpp
index 9687284c657..77ab2df2167 100644
--- a/engines/kyra/script/script_hof.cpp
+++ b/engines/kyra/script/script_hof.cpp
@@ -872,8 +872,7 @@ int KyraEngine_HoF::o2_defineSceneAnim(EMCState *script) {
 	anim.height = stackPos(7);
 	anim.specialSize = stackPos(9);
 	anim.shapeIndex = stackPos(11);
-	if (stackPosString(12) != nullptr)
-		strcpy(anim.filename, stackPosString(12));
+	strcpy(anim.filename, stackPosString(12));
 
 	if (anim.flags & 0x40) {
 		if (!_sceneAnimMovie[animId]->open(anim.filename, 1, nullptr))