commit 9dd7ead0857960829acfc127b48cefdb17823477
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Dec 07 21:14:00 2011 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Dec 07 21:14:00 2011 +0000
tree b2ae0aeb4f2154b9962da9ea2bbafd2b72d388af
parent 93047c67855cd0bfee539cbebbd9814e1aff6ba8

Guard against releasing NULL textures.

ANGLEBUG=265
TRAC #19196
Signed-off-by: Daniel Koch
Author: Nicolas Capens

git-svn-id: http://angleproject.googlecode.com/svn/trunk@905 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index ad20fd7..a38bea9 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 904
+#define BUILD_REVISION 905
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index 67ff7fa..5dd545c 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1656,7 +1656,10 @@
 
 TextureStorage2D::~TextureStorage2D()
 {
-    mTexture->Release();
+    if (mTexture)
+    {
+        mTexture->Release();
+    }
 }
 
 IDirect3DSurface9 *TextureStorage2D::getSurfaceLevel(int level)
@@ -2294,7 +2297,10 @@
 
 TextureStorageCubeMap::~TextureStorageCubeMap()
 {
-    mTexture->Release();
+    if (mTexture)
+    {
+        mTexture->Release();
+    }
 }
 
 IDirect3DSurface9 *TextureStorageCubeMap::getCubeMapSurface(GLenum faceTarget, int level)