From af9d3f7c9cfc24d5c12ec4e1884b18e448681ca4 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 26 May 2022 11:37:42 +0300 Subject: [PATCH] GOB: Remove needless NULL validation Reported by GCC 12: goblin.cpp: In destructor 'virtual Gob::Goblin::~Goblin()': goblin.cpp:110:77: warning: comparing the result of pointer addition '(((Gob::Goblin*)this)->Gob::Goblin::_goblins[i]->Gob::Goblin::Gob_Object::realStateMach + ((sizetype)(((long long unsigned int)state) * 48)))' and NULL [-Waddress] 110 | if (_goblins[i]->realStateMach[state]) | ^ --- engines/gob/goblin.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index b9760d255d9b..7f822c84c04e 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -107,10 +107,8 @@ Goblin::~Goblin() { if (_goblins[i]) { if (_goblins[i]->realStateMach) { for (state = 0; state < (i == 3 ? 70 : 40); state++) - if (_goblins[i]->realStateMach[state]) - for (col = 0; col < 6; col++) - if (_goblins[i]->realStateMach[state][col]) - delete _goblins[i]->realStateMach[state][col]; + for (col = 0; col < 6; col++) + delete _goblins[i]->realStateMach[state][col]; delete[] _goblins[i]->realStateMach; } delete _goblins[i];