Guard against releasing NULL textures.

ANGLEBUG=265 TRAC #19196 Signed-off-by: Daniel Koch Author: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@905 736b8ea6-26fd-11df-bfd4-992fa37f6226

Guard against releasing NULL textures.
7f4dee14 · daniel@transgaming.com · d3552230 · 7f4dee14 · 7f4dee14
Commit 7f4dee14 authored Dec 07, 2011 by daniel@transgaming.com
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

version.h src/common/version.h +1 -1

Texture.cpp src/libGLESv2/Texture.cpp +6 -0

No files found.
--- a/src/common/version.h
+++ b/src/common/version.h
 #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)

--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1656,7 +1656,10 @@ TextureStorage2D::TextureStorage2D(int levels, D3DFORMAT format, int width, int 
 TextureStorage2D::~TextureStorage2D()
 {
+    if (mTexture)
+    {
        mTexture->Release();
+    }
 }
 IDirect3DSurface9 *TextureStorage2D::getSurfaceLevel(int level)
@@ -2294,7 +2297,10 @@ TextureStorageCubeMap::TextureStorageCubeMap(int levels, D3DFORMAT format, int s
 TextureStorageCubeMap::~TextureStorageCubeMap()
 {
+    if (mTexture)
+    {
        mTexture->Release();
+    }
 }
 IDirect3DSurface9 *TextureStorageCubeMap::getCubeMapSurface(GLenum faceTarget, int level)