[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33998] trunk/blender/source/gameengine/ VideoTexture/ImageBase.cpp: CXX_Guardedalloc was complaining about freeing NULL pointers in VideoTexture .

Mitchell Stokes mogurijin at gmail.com
Sun Jan 2 11:05:23 CET 2011


Revision: 33998
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33998
Author:   moguri
Date:     2011-01-02 11:05:22 +0100 (Sun, 02 Jan 2011)

Log Message:
-----------
CXX_Guardedalloc was complaining about freeing NULL pointers in VideoTexture. I've added guards around the deletes to prevent this.

Modified Paths:
--------------
    trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp

Modified: trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp
===================================================================
--- trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp	2011-01-02 09:54:44 UTC (rev 33997)
+++ trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp	2011-01-02 10:05:22 UTC (rev 33998)
@@ -56,7 +56,8 @@
 ImageBase::~ImageBase (void)
 {
 	// release image
-	delete [] m_image;
+	if (m_image)
+		delete [] m_image;
 }
 
 
@@ -198,7 +199,8 @@
 			// set new buffer size
 			m_imgSize = newSize;
 			// release previous and create new buffer
-			delete [] m_image;
+			if (m_image)
+				delete [] m_image;
 			m_image = new unsigned int[m_imgSize];
 		}
 		// new image size





More information about the Bf-blender-cvs mailing list