Fix crash due to missing pointer validation

nerzhul · nerzhul · commit 014a1a080510 · 2017-07-02T22:26:25.000+02:00
Fix #6092
diff --git 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 */

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,7 @@ struct TextDestPlayerInventory : public TextDest`
`121`	`121`
`122`	`122`	`struct LocalFormspecHandler : public TextDest`
`123`	`123`	`{`
`124`		`- LocalFormspecHandler(const std::string &formname):`
`125`		`- m_client(NULL)`
	`124`	`+ LocalFormspecHandler(const std::string &formname)`
`126`	`125`	`{`
`127`	`126`	`m_formname = formname;`
`128`	`127`	`}`
`@@ -174,10 +173,11 @@ struct LocalFormspecHandler : public TextDest`
`174`	`173`	`}`
`175`	`174`
`176`	`175`	`// Don't disable this part when modding is disabled, it's used in builtin`
`177`		`- m_client->getScript()->on_formspec_input(m_formname, fields);`
	`176`	`+ if (m_client && m_client->getScript())`
	`177`	`+ m_client->getScript()->on_formspec_input(m_formname, fields);`
`178`	`178`	`}`
`179`	`179`
`180`		`- Client *m_client;`
	`180`	`+ Client *m_client = nullptr;`
`181`	`181`	`};`
`182`	`182`
`183`	`183`	`/* Form update callback */`