Merge pull request #238 from cortex-command-community/null-deref

garethyr · web-flow · commit a00f3cb4b97d · 2020-11-15T23:06:58.000-04:00
Fix possible null pointer dereference in sceneman
diff --git a/Managers/SceneMan.cpp b/Managers/SceneMan.cpp
@@ -437,9 +437,10 @@ void SceneMan::Destroy()
 
 Vector SceneMan::GetSceneDim() const
 {
-    if (m_pCurrentScene)
-        RTEAssert(m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");
-        return m_pCurrentScene->GetDimensions();
+	if (m_pCurrentScene) {
+		RTEAssert(m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");
+		return m_pCurrentScene->GetDimensions();
+	}
     return Vector();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -437,9 +437,10 @@ void SceneMan::Destroy()`
`437`	`437`
`438`	`438`	`Vector SceneMan::GetSceneDim() const`
`439`	`439`	`{`
`440`		`- if (m_pCurrentScene)`
`441`		`- RTEAssert(m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");`
`442`		`- return m_pCurrentScene->GetDimensions();`
	`440`	`+ if (m_pCurrentScene) {`
	`441`	`+ RTEAssert(m_pCurrentScene->GetTerrain() && m_pCurrentScene->GetTerrain()->GetBitmap(), "Trying to get terrain info before there is a scene or terrain!");`
	`442`	`+ return m_pCurrentScene->GetDimensions();`
	`443`	`+ }`
`443`	`444`	`return Vector();`
`444`	`445`	`}`
`445`	`446`