[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37671] trunk/blender/source/blender: fix for crash drawing zero length motion path and a leak with zero length paths .

Campbell Barton ideasman42 at gmail.com
Mon Jun 20 19:50:59 CEST 2011


Revision: 37671
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37671
Author:   campbellbarton
Date:     2011-06-20 17:50:59 +0000 (Mon, 20 Jun 2011)
Log Message:
-----------
fix for crash drawing zero length motion path and a leak with zero length paths.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/anim.c
    trunk/blender/source/blender/editors/space_view3d/drawanimviz.c

Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c	2011-06-20 17:28:25 UTC (rev 37670)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c	2011-06-20 17:50:59 UTC (rev 37671)
@@ -171,7 +171,12 @@
 		avs= &ob->avs;
 		dst= &ob->mpath;
 	}
-	
+
+	/* avoid 0 size allocs */
+	if(avs->path_sf >= avs->path_ef) {
+		return NULL;
+	}
+
 	/* if there is already a motionpath, just return that,
 	 * but provided it's settings are ok 
 	 */

Modified: trunk/blender/source/blender/editors/space_view3d/drawanimviz.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawanimviz.c	2011-06-20 17:28:25 UTC (rev 37670)
+++ trunk/blender/source/blender/editors/space_view3d/drawanimviz.c	2011-06-20 17:50:59 UTC (rev 37671)
@@ -117,7 +117,11 @@
 		len = mpath->length;
 		mpv_start= mpath->points;
 	}
-	
+
+	if(len <= 0) {
+		return;
+	}
+
 	/* draw curve-line of path */
 	glShadeModel(GL_SMOOTH);
 	




More information about the Bf-blender-cvs mailing list