[Scummvm-git-logs] scummvm master -> 2d651fd0f4fd8e369e7b7d88eacc8f3b7bebde3a

[criezy]

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:
2d651fd0f4 OPENGL: Fix dereferencing null pointer in OpenGLGraphicsManager


Commit: 2d651fd0f4fd8e369e7b7d88eacc8f3b7bebde3a
    https://github.com/scummvm/scummvm/commit/2d651fd0f4fd8e369e7b7d88eacc8f3b7bebde3a
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-09-13T22:58:13+01:00

Commit Message:
OPENGL: Fix dereferencing null pointer in OpenGLGraphicsManager

This fixes a crash when calling displayActivityIconOnOSD with a
NULL icon, which is used to remove the current activity icon.

Changed paths:
    backends/graphics/opengl/opengl-graphics.cpp



diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 3e2be6e..e4df94c 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -821,7 +821,8 @@ void OpenGLGraphicsManager::displayActivityIconOnOSD(const Graphics::Surface *ic
 	_osdIconChangeRequest = true;
 
 	_osdIconNextData.free();
-	_osdIconNextData.copyFrom(*icon);
+	if (icon)
+		_osdIconNextData.copyFrom(*icon);
 #endif
 }