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

[somaen]

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

Summary:
a18212b4d4 GRIM: Initialize Lua value even for Nil to avoid uninit values
e70c103ca3 GRIM: Initialize Overlay::_layer


Commit: a18212b4d4f56e4e538366ae1c50cada8d9b8eb7
    https://github.com/scummvm/scummvm/commit/a18212b4d4f56e4e538366ae1c50cada8d9b8eb7
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2022-10-02T01:16:36+02:00

Commit Message:
GRIM: Initialize Lua value even for Nil to avoid uninit values

In practice shouldn't matter, but just to avoid having
uninitialized values around, we should set the value-field,
even for Nil.

Fixes COVERITY: 1470689

Changed paths:
    engines/grim/lua.cpp


diff --git a/engines/grim/lua.cpp b/engines/grim/lua.cpp
index 7fd520e319a..29ed9909b4e 100644
--- a/engines/grim/lua.cpp
+++ b/engines/grim/lua.cpp
@@ -78,6 +78,8 @@ void LuaObjects::add(const char *str) {
 void LuaObjects::addNil() {
 	Obj obj;
 	obj._type = Obj::Nil;
+	// Just set a value to avoid having uninitialized fields.
+	obj._value.object = nullptr;
 	_objects.push_back(obj);
 }
 


Commit: e70c103ca377f46b0938a5821b2528fdc13d9d31
    https://github.com/scummvm/scummvm/commit/e70c103ca377f46b0938a5821b2528fdc13d9d31
Author: Einar Johan Trøan Sømåen (somaen at scummvm.org)
Date: 2022-10-02T01:27:13+02:00

Commit Message:
GRIM: Initialize Overlay::_layer

Fixes COVERITY: 1433532

Changed paths:
    engines/grim/remastered/overlay.h


diff --git a/engines/grim/remastered/overlay.h b/engines/grim/remastered/overlay.h
index cb9268aa146..6c13598da2d 100644
--- a/engines/grim/remastered/overlay.h
+++ b/engines/grim/remastered/overlay.h
@@ -47,7 +47,7 @@ public:
 	Material *_material;
 	float _x;
 	float _y;
-	int _layer;
+	int _layer = 0;
 };
 
 }