[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46837] trunk/blender/source/blender/ blenkernel/intern/key.c: fix for fix - possible on second loop to use freed memory still.

Campbell Barton ideasman42 at gmail.com
Mon May 21 12:13:43 CEST 2012


Revision: 46837
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46837
Author:   campbellbarton
Date:     2012-05-21 10:13:43 +0000 (Mon, 21 May 2012)
Log Message:
-----------
fix for fix - possible on second loop to use freed memory still.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/key.c

Modified: trunk/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/key.c	2012-05-21 10:11:51 UTC (rev 46836)
+++ trunk/blender/source/blender/blenkernel/intern/key.c	2012-05-21 10:13:43 UTC (rev 46837)
@@ -721,7 +721,6 @@
 	KeyBlock *kb;
 	int *ofsp, ofs[3], elemsize, b;
 	char *cp, *poin, *reffrom, *from, elemstr[8];
-	char *freefrom = NULL, *freereffrom = NULL;
 	int poinsize;
 
 	/* currently always 0, in future key_pointer_size may assign */
@@ -754,6 +753,7 @@
 			if (!(kb->flag & KEYBLOCK_MUTE) && icuval != 0.0f && kb->totelem == tot) {
 				KeyBlock *refb;
 				float weight, *weights = kb->weights;
+				char *freefrom = NULL, *freereffrom = NULL;
 
 				/* reference now can be any block */
 				refb = BLI_findlink(&key->block, kb->relative);




More information about the Bf-blender-cvs mailing list