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

[scemino]

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

Summary:
d31ff577c6 TWP: Fix uninitialized scalar field _active in Inventory.
aa5ef15e69 TWP: Fix unchecked return value in method say.
cb1753dd3e TWP: Fix unchecked return value in method getText.
1ebbad8146 TWP: Fix resource leak in method loadGame.
eb6bc156b9 TWP: Fix unreachable code detected in squirrel. PVS-Studio V779


Commit: d31ff577c63544c9043defb67ebd2e2c81b7a77f
    https://github.com/scummvm/scummvm/commit/d31ff577c63544c9043defb67ebd2e2c81b7a77f
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-25T20:27:44+01:00

Commit Message:
TWP: Fix uninitialized scalar field _active in Inventory.

Coverity CID 1540869

Changed paths:
    engines/twp/scenegraph.h


diff --git a/engines/twp/scenegraph.h b/engines/twp/scenegraph.h
index dcd1b3cea9c..22dae349b20 100644
--- a/engines/twp/scenegraph.h
+++ b/engines/twp/scenegraph.h
@@ -294,7 +294,7 @@ private:
 class Inventory : public Node {
 public:
 	Inventory();
-	void update(float elapsed, Common::SharedPtr<Object> actor = nullptr,const Color &backColor = Color(0, 0, 0), const Color &verbNormal = Color(0, 0, 0));
+	void update(float elapsed, Common::SharedPtr<Object> actor = nullptr, const Color &backColor = Color(0, 0, 0), const Color &verbNormal = Color(0, 0, 0));
 
 	bool isOver() const { return _over; }
 	Common::SharedPtr<Object> getObject() const { return _obj; }
@@ -310,7 +310,7 @@ private:
 	void drawSprite(const SpriteSheetFrame &sf, Texture *texture, const Color &color, const Math::Matrix4 &trsf);
 
 public:
-	bool _active;
+	bool _active = false;
 
 private:
 	Common::SharedPtr<Object> _actor;


Commit: aa5ef15e69202a23e3aa361ee90234af42a96610
    https://github.com/scummvm/scummvm/commit/aa5ef15e69202a23e3aa361ee90234af42a96610
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-25T20:27:44+01:00

Commit Message:
TWP: Fix unchecked return value in method say.

Coverity CID 1540868

Changed paths:
    engines/twp/motor.cpp


diff --git a/engines/twp/motor.cpp b/engines/twp/motor.cpp
index 22c024e538d..da856ee50db 100644
--- a/engines/twp/motor.cpp
+++ b/engines/twp/motor.cpp
@@ -416,7 +416,9 @@ void Talking::say(const Common::String &text) {
 			if (SQ_FAILED(sq_call(v, 1, SQTrue, SQTrue))) {
 				error("Error calling code %s", code.c_str());
 			} else {
-				sqget(v, -1, txt);
+				if (SQ_FAILED(sqget(v, -1, txt))) {
+					error("Error getting call result %s", code.c_str());
+				}
 				sq_settop(v, top);
 			}
 		}


Commit: cb1753dd3ec98a349c5c249abbd899a4a04b5c75
    https://github.com/scummvm/scummvm/commit/cb1753dd3ec98a349c5c249abbd899a4a04b5c75
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-25T20:27:44+01:00

Commit Message:
TWP: Fix unchecked return value in method getText.

Coverity CID 1540864

Changed paths:
    engines/twp/tsv.cpp


diff --git a/engines/twp/tsv.cpp b/engines/twp/tsv.cpp
index d94ef7e537d..0bc4dbf9ac2 100644
--- a/engines/twp/tsv.cpp
+++ b/engines/twp/tsv.cpp
@@ -75,7 +75,9 @@ Common::String TextDb::getText(const Common::String &text) {
 				if (SQ_FAILED(sq_call(v, 1, SQTrue, SQTrue))) {
 					error("Error calling code %s", code.c_str());
 				} else {
-					sqget(v, -1, txt);
+					if (SQ_FAILED(sqget(v, -1, txt))) {
+						error("Error getting result from code %s", code.c_str());
+					}
 					sq_settop(v, top);
 					return getText(txt);
 				}


Commit: 1ebbad81467d8cf6c7d5014979a4f4569f6ba5e3
    https://github.com/scummvm/scummvm/commit/1ebbad81467d8cf6c7d5014979a4f4569f6ba5e3
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-25T20:27:44+01:00

Commit Message:
TWP: Fix resource leak in method loadGame.

Coverity CID 1540873

Changed paths:
    engines/twp/savegame.cpp


diff --git a/engines/twp/savegame.cpp b/engines/twp/savegame.cpp
index b4d8514f4f9..26eaf40c849 100644
--- a/engines/twp/savegame.cpp
+++ b/engines/twp/savegame.cpp
@@ -409,6 +409,7 @@ bool SaveGameManager::loadGame(Common::SeekableReadStream &stream) {
 	long long int version = json["version"]->asIntegerNumber();
 	if (version != 2) {
 		error("Cannot load savegame version %lld", version);
+		delete jSavegame;
 		return false;
 	}
 	uint32 gameTime = (uint32)json["gameTime"]->asNumber();
@@ -441,6 +442,7 @@ bool SaveGameManager::loadGame(Common::SeekableReadStream &stream) {
 
 	sqcall("postLoad");
 
+	delete jSavegame;
 	return true;
 }
 


Commit: eb6bc156b9b81ba749e88dfd7f42c452585b6747
    https://github.com/scummvm/scummvm/commit/eb6bc156b9b81ba749e88dfd7f42c452585b6747
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-25T20:34:28+01:00

Commit Message:
TWP: Fix unreachable code detected in squirrel. PVS-Studio V779

Changed paths:
    engines/twp/squirrel/sqvm.cpp


diff --git a/engines/twp/squirrel/sqvm.cpp b/engines/twp/squirrel/sqvm.cpp
index bf60dd3ac22..86b3f379afc 100755
--- a/engines/twp/squirrel/sqvm.cpp
+++ b/engines/twp/squirrel/sqvm.cpp
@@ -265,8 +265,6 @@ bool SQVM::ObjCmp(const SQObjectPtr &o1,const SQObjectPtr &o2,SQInteger &result)
         else { Raise_CompareError(o1,o2); return false; }
 
     }
-    assert(0);
-    _RET_SUCCEED(0); //cannot happen
 }
 
 bool SQVM::CMP_OP(CmpOP op, const SQObjectPtr &o1,const SQObjectPtr &o2,SQObjectPtr &res)