[Scummvm-git-logs] scummvm master -> 60f9ee404b3d89e98527e81a4cc58acdb64c929d

[scemino]

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

Summary:
0b574ab76b TWP: Fix memory leak in capture
7604305b88 TWP: Fix memory leak in savegame
a08e11aedf TWP: Fix big parameter passed by value in TextNode
0be050ff9d TWP: Fix uninitialized field in GGFont
36ea5f1e13 TWP: Fix loadStream return value in ResManager
60f9ee404b TWP: Fix unchecked return value in sqcallfunc


Commit: 0b574ab76bd67c115fef6359e884a3f4d3db4966
    https://github.com/scummvm/scummvm/commit/0b574ab76bd67c115fef6359e884a3f4d3db4966
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-19T21:31:57+01:00

Commit Message:
TWP: Fix memory leak in capture

Coverity CID 1540483

Changed paths:
    engines/twp/twp.cpp


diff --git a/engines/twp/twp.cpp b/engines/twp/twp.cpp
index f0de334fa2b..0ae3397360c 100644
--- a/engines/twp/twp.cpp
+++ b/engines/twp/twp.cpp
@@ -1763,10 +1763,12 @@ void TwpEngine::capture(Common::WriteStream &stream, Math::Vector2d size) {
 	Graphics::Surface s;
 	s.init(SCREEN_WIDTH, SCREEN_HEIGHT, 4 * SCREEN_WIDTH, data.data(), fmt);
 	s.flipVertical(Common::Rect(s.w, s.h));
-	s.scale(size.getX(), size.getY());
+	Graphics::Surface *scaledSurface = s.scale(size.getX(), size.getY());
 
 	// and save to stream
 	Image::writePNG(stream, s);
+
+	delete scaledSurface;
 }
 
 HSQUIRRELVM TwpEngine::getVm() { return _vm->get(); }


Commit: 7604305b88e1da376b2b7587318869d7abe7f3f9
    https://github.com/scummvm/scummvm/commit/7604305b88e1da376b2b7587318869d7abe7f3f9
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-19T21:37:50+01:00

Commit Message:
TWP: Fix memory leak in savegame

Coverity CID 1540629

Changed paths:
    engines/twp/savegame.cpp


diff --git a/engines/twp/savegame.cpp b/engines/twp/savegame.cpp
index 3351f8d9422..610a3ec4567 100644
--- a/engines/twp/savegame.cpp
+++ b/engines/twp/savegame.cpp
@@ -1056,6 +1056,7 @@ void SaveGameManager::saveGame(Common::WriteStream *ws) {
 
 	// and write data
 	ws->write(buffer.data(), buffer.size());
+	delete data;
 
 	sqcall("postSave");
 }


Commit: a08e11aedf234f3dd8f2aaf3f9de9b9139dc4882
    https://github.com/scummvm/scummvm/commit/a08e11aedf234f3dd8f2aaf3f9de9b9139dc4882
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-19T21:42:41+01:00

Commit Message:
TWP: Fix big parameter passed by value in TextNode

Coverity CID 1540556

Changed paths:
    engines/twp/scenegraph.cpp
    engines/twp/scenegraph.h


diff --git a/engines/twp/scenegraph.cpp b/engines/twp/scenegraph.cpp
index bec6399d24e..dc8d517038d 100644
--- a/engines/twp/scenegraph.cpp
+++ b/engines/twp/scenegraph.cpp
@@ -449,7 +449,7 @@ TextNode::TextNode() : Node("text") {
 
 TextNode::~TextNode() {}
 
-void TextNode::setText(Text text) {
+void TextNode::setText(const Text &text) {
 	_text = text;
 	updateBounds();
 }
diff --git a/engines/twp/scenegraph.h b/engines/twp/scenegraph.h
index c41b03bb82f..8486084952b 100644
--- a/engines/twp/scenegraph.h
+++ b/engines/twp/scenegraph.h
@@ -201,7 +201,7 @@ public:
 	TextNode();
 	virtual ~TextNode() final;
 
-	void setText(Text text);
+	void setText(const Text &text);
 	void updateBounds();
 	virtual Rectf getRect() const override final;
 


Commit: 0be050ff9da35b63da44a7ffc55a1ce0745fb0d0
    https://github.com/scummvm/scummvm/commit/0be050ff9da35b63da44a7ffc55a1ce0745fb0d0
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-19T21:46:42+01:00

Commit Message:
TWP: Fix uninitialized field in GGFont

Coverity CID 1540630

Changed paths:
    engines/twp/font.h


diff --git a/engines/twp/font.h b/engines/twp/font.h
index 4c1bea90326..55f499e9a41 100644
--- a/engines/twp/font.h
+++ b/engines/twp/font.h
@@ -87,7 +87,7 @@ public:
 
 private:
 	Common::HashMap<CodePoint, Glyph> _glyphs;
-	int _lineHeight;
+	int _lineHeight = 0;
 	Common::String _name;
 };
 


Commit: 36ea5f1e13918a0198b534d754724ac7465706b3
    https://github.com/scummvm/scummvm/commit/36ea5f1e13918a0198b534d754724ac7465706b3
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-19T21:49:56+01:00

Commit Message:
TWP: Fix loadStream return value in ResManager

Coverity CID 1540625

Changed paths:
    engines/twp/resmanager.cpp


diff --git a/engines/twp/resmanager.cpp b/engines/twp/resmanager.cpp
index c88723017d4..fee0b71e92d 100644
--- a/engines/twp/resmanager.cpp
+++ b/engines/twp/resmanager.cpp
@@ -41,7 +41,10 @@ void ResManager::loadTexture(const Common::String &name) {
 		error("Texture %s not found", name.c_str());
 	}
 	Image::PNGDecoder d;
-	d.loadStream(r);
+	if(!d.loadStream(r)) {
+		error("PNG %s not loaded", name.c_str());
+		return;
+	}
 	const Graphics::Surface *surface = d.getSurface();
 	if (!surface) {
 		error("PNG %s not loaded", name.c_str());


Commit: 60f9ee404b3d89e98527e81a4cc58acdb64c929d
    https://github.com/scummvm/scummvm/commit/60f9ee404b3d89e98527e81a4cc58acdb64c929d
Author: scemino (scemino74 at gmail.com)
Date: 2024-03-19T21:54:41+01:00

Commit Message:
TWP: Fix unchecked return value in sqcallfunc

Coverity CID 1540601

Changed paths:
    engines/twp/squtil.h


diff --git a/engines/twp/squtil.h b/engines/twp/squtil.h
index d1ddca84e26..858b7e5ff86 100644
--- a/engines/twp/squtil.h
+++ b/engines/twp/squtil.h
@@ -271,7 +271,11 @@ void sqcallfunc(TResult &result, const char *name, T... args) {
 		error("function %s call failed", name);
 		return;
 	}
-	sqget(v, -1, result);
+	if (SQ_FAILED(sqget(v, -1, result))) {
+		sq_settop(v, top);
+		error("function %s failed to get result", name);
+		return;
+	}
 	sq_settop(v, top);
 }