[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45739] trunk/blender/source/blender/bmesh /intern/bmesh_mods.c: add missing NULL check for BM_vert_collapse_faces(), could crash in rare cases.

Campbell Barton ideasman42 at gmail.com
Wed Apr 18 10:11:11 CEST 2012


Revision: 45739
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45739
Author:   campbellbarton
Date:     2012-04-18 08:11:08 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
add missing NULL check for BM_vert_collapse_faces(), could crash in rare cases.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_mods.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-04-18 07:57:20 UTC (rev 45738)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-04-18 08:11:08 UTC (rev 45739)
@@ -544,7 +544,7 @@
 		ne = bmesh_jekv(bm, ke, kv, TRUE);
 		/* ne = BM_edge_exists(tv, tv2); */ /* same as return above */
 
-		if (kill_degenerate_faces) {
+		if (ne && kill_degenerate_faces) {
 			BLI_array_declare(bad_faces);
 			BMFace **bad_faces = NULL;
 




More information about the Bf-blender-cvs mailing list