From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 30 Apr 2012 09:56:45 +0000 (+0200)
Subject: Reset pointer to 0 after freeing
X-Git-Tag: 071012110112~1299
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c56e756aa9d58c6ebce9df2fb4f41ba94afc5b57;p=profile%2Fivi%2Fqtbase.git

Reset pointer to 0 after freeing

set m_textureResource to 0 after freeing it, to
ensure we allocate a new one two lines below before
using it again 5 lines below.

Change-Id: Ib9c4de94aefed91f15d0fab0cd3c774a64f2f891
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/src/gui/opengl/qopengltextureglyphcache.cpp b/src/gui/opengl/qopengltextureglyphcache.cpp
index b37e8fb..790b92a 100644
--- a/src/gui/opengl/qopengltextureglyphcache.cpp
+++ b/src/gui/opengl/qopengltextureglyphcache.cpp
@@ -106,8 +106,10 @@ void QOpenGLTextureGlyphCache::createTextureData(int width, int height)
     if (height < 16)
         height = 16;
 
-    if (m_textureResource && !m_textureResource->m_texture)
+    if (m_textureResource && !m_textureResource->m_texture) {
         delete m_textureResource;
+        m_textureResource = 0;
+    }
 
     if (!m_textureResource)
         m_textureResource = new QOpenGLGlyphTexture(ctx);
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index c12a83a..8321b8d 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -105,8 +105,10 @@ void QGLTextureGlyphCache::createTextureData(int width, int height)
     if (height < 16)
         height = 16;
 
-    if (m_textureResource && !m_textureResource->m_texture)
+    if (m_textureResource && !m_textureResource->m_texture) {
         delete m_textureResource;
+        m_textureResource = 0;
+    }
 
     if (!m_textureResource)
         m_textureResource = new QGLGlyphTexture(ctx);