From: Loic Blot <loic.blot@unix-experience.fr>
Date: Sun, 2 Jul 2017 20:26:25 +0000 (+0200)
Subject: Fix crash due to missing pointer validation
X-Git-Tag: 5.0.0~1039
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=014a1a08051004cbaecc7f42467cf0509021146d;p=oweals%2Fminetest.git

Fix crash due to missing pointer validation

Fix #6092
---

diff --git a/src/game.cpp b/src/game.cpp
index 827512fbc..9f7b0ca52 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -121,8 +121,7 @@ struct TextDestPlayerInventory : public TextDest
 
 struct LocalFormspecHandler : public TextDest
 {
-	LocalFormspecHandler(const std::string &formname):
-		m_client(NULL)
+	LocalFormspecHandler(const std::string &formname)
 	{
 		m_formname = formname;
 	}
@@ -174,10 +173,11 @@ struct LocalFormspecHandler : public TextDest
 		}
 
 		// Don't disable this part when modding is disabled, it's used in builtin
-		m_client->getScript()->on_formspec_input(m_formname, fields);
+		if (m_client && m_client->getScript())
+			m_client->getScript()->on_formspec_input(m_formname, fields);
 	}
 
-	Client *m_client;
+	Client *m_client = nullptr;
 };
 
 /* Form update callback */