[Scummvm-git-logs] scummvm master -> 26445f4c26b1260a1020c759a6f517f1445c3498

[LubomirR]

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

Summary:
26445f4c26 MUTATIONOFJB: Fix Coverity issues.


Commit: 26445f4c26b1260a1020c759a6f517f1445c3498
    https://github.com/scummvm/scummvm/commit/26445f4c26b1260a1020c759a6f517f1445c3498
Author: Ľubomír Remák (lubomirr at lubomirr.eu)
Date: 2018-08-27T20:07:53+02:00

Commit Message:
MUTATIONOFJB: Fix Coverity issues.

Changed paths:
    engines/mutationofjb/gui.cpp
    engines/mutationofjb/inventory.h
    engines/mutationofjb/mutationofjb.cpp
    engines/mutationofjb/tasks/conversationtask.cpp


diff --git a/engines/mutationofjb/gui.cpp b/engines/mutationofjb/gui.cpp
index 6266ff0..7c219bc 100644
--- a/engines/mutationofjb/gui.cpp
+++ b/engines/mutationofjb/gui.cpp
@@ -64,7 +64,9 @@ enum {
 
 Gui::Gui(Game &game, Graphics::Screen *screen)
 	: _game(game),
-	  _screen(screen) {}
+	  _screen(screen),
+	  _inventoryWidget(nullptr),
+	  _conversationWidget(nullptr) {}
 
 Gui::~Gui() {
 	for (Common::Array<Widget *>::iterator it = _widgets.begin(); it != _widgets.end(); ++it) {
diff --git a/engines/mutationofjb/inventory.h b/engines/mutationofjb/inventory.h
index 79a0d75..d75ef5a 100644
--- a/engines/mutationofjb/inventory.h
+++ b/engines/mutationofjb/inventory.h
@@ -45,6 +45,8 @@ public:
 
 	typedef Common::Array<Common::String> Items;
 
+	Inventory() : _observer(nullptr) {}
+
 	const Items &getItems() const;
 	bool hasItem(const Common::String &item) const;
 	void addItem(const Common::String &item);
diff --git a/engines/mutationofjb/mutationofjb.cpp b/engines/mutationofjb/mutationofjb.cpp
index 376c024..dec3ab8 100644
--- a/engines/mutationofjb/mutationofjb.cpp
+++ b/engines/mutationofjb/mutationofjb.cpp
@@ -45,6 +45,7 @@ MutationOfJBEngine::MutationOfJBEngine(OSystem *syst)
 	: Engine(syst),
 	  _console(nullptr),
 	  _screen(nullptr),
+	  _game(nullptr),
 	  _mapObjectId(0),
 	  _cursorState(CURSOR_IDLE) {
 
diff --git a/engines/mutationofjb/tasks/conversationtask.cpp b/engines/mutationofjb/tasks/conversationtask.cpp
index 5b0f0f4..9c3ae4b 100644
--- a/engines/mutationofjb/tasks/conversationtask.cpp
+++ b/engines/mutationofjb/tasks/conversationtask.cpp
@@ -113,6 +113,9 @@ void ConversationTask::showChoicesOrPick() {
 	Game &game = getTaskManager()->getGame();
 	GameData &gameData = game.getGameData();
 	Scene *const scene = gameData.getScene(_sceneId);
+	if (!scene) {
+		return;
+	}
 
 	Common::Array<uint32> itemsWithValidQuestions;
 	Common::Array<uint32> itemsWithValidResponses;