From 8ff8ec4abd98ce185c2f3fd1688523b16f847f57 Mon Sep 17 00:00:00 2001 From: Petr Mikheev Date: Mon, 12 Jul 2021 11:01:32 +0200 Subject: [PATCH] Fix coverity issues --- apps/openmw/engine.cpp | 3 ++- apps/openmw/mwbase/luamanager.hpp | 14 +++++++------- components/lua/luastate.cpp | 4 +++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index f554821b3d..8c210076a4 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -407,6 +407,7 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager) , mExportFonts(false) , mRandomSeed(0) , mScriptContext (nullptr) + , mLuaManager (nullptr) , mFSStrict (false) , mScriptBlacklistUse (true) , mNewGame (false) @@ -899,7 +900,7 @@ private: Engine* mEngine; std::mutex mMutex; std::condition_variable mCV; - bool mUpdateRequest; + bool mUpdateRequest = false; double mDt = 0; bool mIsGuiMode = false; std::optional mThread; diff --git a/apps/openmw/mwbase/luamanager.hpp b/apps/openmw/mwbase/luamanager.hpp index 4e437246c4..7f3c50a9cf 100644 --- a/apps/openmw/mwbase/luamanager.hpp +++ b/apps/openmw/mwbase/luamanager.hpp @@ -42,14 +42,14 @@ namespace MWBase struct ActorControls { - bool mDisableAI; - bool mControlledFromLua; + bool mDisableAI = false; + bool mControlledFromLua = false; - bool mJump; - bool mRun; - float mMovement; - float mSideMovement; - float mTurn; + bool mJump = false; + bool mRun = false; + float mMovement = 0; + float mSideMovement = 0; + float mTurn = 0; }; virtual ActorControls* getActorControls(const MWWorld::Ptr&) const = 0; diff --git a/components/lua/luastate.cpp b/components/lua/luastate.cpp index 25fa3aead1..753e3369f6 100644 --- a/components/lua/luastate.cpp +++ b/components/lua/luastate.cpp @@ -82,7 +82,9 @@ namespace LuaUtil sol::table LuaState::getMutableFromReadOnly(const sol::userdata& ro) { sol::stack::push(mLua, ro); - lua_getmetatable(mLua, -1); + int ok = lua_getmetatable(mLua, -1); + assert(ok); + (void)ok; sol::table res = sol::stack::pop(mLua); lua_pop(mLua, 1); return res;