[Bug 13480] Back port fix for nil pointer crash

Monte Goulding · Monte Goulding · commit c78b34dfaa8b · 2016-03-07T16:38:03.000+11:00
diff --git a/docs/notes/bugfix-13480.md b/docs/notes/bugfix-13480.md
@@ -0,0 +1,2 @@
+# Fix a potential nil pointer crash
+
diff --git a/engine/src/desktop.cpp b/engine/src/desktop.cpp
@@ -99,14 +99,18 @@ void MCPlatformHandleApplicationShutdownRequest(bool& r_terminate)
 
 void MCPlatformHandleApplicationSuspend(void)
 {
-	MCdefaultstackptr -> getcard() -> message(MCM_suspend);
+	// FG-2014-09-22: [[ Bugfix 13480 ]] May have no default stack on startup
+    if (MCdefaultstackptr)
+        MCdefaultstackptr -> getcard() -> message(MCM_suspend);
 	MCappisactive = False;
 }
 
 void MCPlatformHandleApplicationResume(void)
 {
-	MCappisactive = True;
-	MCdefaultstackptr -> getcard() -> message(MCM_resume);
+	// FG-2014-09-22: [[ Bugfix 13480 ]] May have no default stack on startup
+    MCappisactive = True;
+    if (MCdefaultstackptr)
+        MCdefaultstackptr -> getcard() -> message(MCM_resume);
 }
 
 void MCPlatformHandleApplicationRun(bool& r_continue)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Fix a potential nil pointer crash`
	`2`	`+`
Original file line number	Diff line number	Diff line change
`@@ -99,14 +99,18 @@ void MCPlatformHandleApplicationShutdownRequest(bool& r_terminate)`
`99`	`99`
`100`	`100`	`void MCPlatformHandleApplicationSuspend(void)`
`101`	`101`	`{`
`102`		`- MCdefaultstackptr -> getcard() -> message(MCM_suspend);`
	`102`	`+ // FG-2014-09-22: [[ Bugfix 13480 ]] May have no default stack on startup`
	`103`	`+ if (MCdefaultstackptr)`
	`104`	`+ MCdefaultstackptr -> getcard() -> message(MCM_suspend);`
`103`	`105`	`MCappisactive = False;`
`104`	`106`	`}`
`105`	`107`
`106`	`108`	`void MCPlatformHandleApplicationResume(void)`
`107`	`109`	`{`
`108`		`- MCappisactive = True;`
`109`		`- MCdefaultstackptr -> getcard() -> message(MCM_resume);`
	`110`	`+ // FG-2014-09-22: [[ Bugfix 13480 ]] May have no default stack on startup`
	`111`	`+ MCappisactive = True;`
	`112`	`+ if (MCdefaultstackptr)`
	`113`	`+ MCdefaultstackptr -> getcard() -> message(MCM_resume);`
`110`	`114`	`}`
`111`	`115`
`112`	`116`	`void MCPlatformHandleApplicationRun(bool& r_continue)`