[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50957] trunk/blender/source/blender/ compositor/operations: fix for double free.

Campbell Barton ideasman42 at gmail.com
Sun Sep 30 13:15:40 CEST 2012


Revision: 50957
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50957
Author:   campbellbarton
Date:     2012-09-30 11:15:40 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
fix for double free.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp	2012-09-30 10:45:37 UTC (rev 50956)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianXBlurOperation.cpp	2012-09-30 11:15:40 UTC (rev 50957)
@@ -108,8 +108,10 @@
 void GaussianXBlurOperation::deinitExecution()
 {
 	BlurBaseOperation::deinitExecution();
-	MEM_freeN(this->m_gausstab);
-	this->m_gausstab = NULL;
+	if (this->m_gausstab) {
+		MEM_freeN(this->m_gausstab);
+		this->m_gausstab = NULL;
+	}
 
 	deinitMutex();
 }

Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp	2012-09-30 10:45:37 UTC (rev 50956)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianYBlurOperation.cpp	2012-09-30 11:15:40 UTC (rev 50957)
@@ -109,8 +109,10 @@
 void GaussianYBlurOperation::deinitExecution()
 {
 	BlurBaseOperation::deinitExecution();
-	MEM_freeN(this->m_gausstab);
-	this->m_gausstab = NULL;
+	if (this->m_gausstab) {
+		MEM_freeN(this->m_gausstab);
+		this->m_gausstab = NULL;
+	}
 
 	deinitMutex();
 }




More information about the Bf-blender-cvs mailing list