[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11124] branches/2-44-stable/blender/ source/blender: Mesh.c - edge.key() did not check for a bad pointer ( own error)

Campbell Barton cbarton at metavr.com
Fri Jun 29 15:41:20 CEST 2007


Revision: 11124
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11124
Author:   campbellbarton
Date:     2007-06-29 15:41:20 +0200 (Fri, 29 Jun 2007)

Log Message:
-----------
Mesh.c - edge.key() did not check for a bad pointer (own error)
editdeform.c - removing a newly created defgroup in editmode would crash. (was not checking for a NELL lattice->dvert )

Modified Paths:
--------------
    branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c
    branches/2-44-stable/blender/source/blender/src/editdeform.c

Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c	2007-06-29 08:59:26 UTC (rev 11123)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Mesh.c	2007-06-29 13:41:20 UTC (rev 11124)
@@ -2302,6 +2302,9 @@
 static PyObject *MEdge_getKey( BPy_MEdge * self )
 {
 	MEdge *edge = MEdge_get_pointer( self );
+	if (!edge)
+		return NULL; /* error is set */	
+	
 	PyObject *attr = PyTuple_New( 2 );
 	if (edge->v1 > edge->v2) {
 		PyTuple_SetItem( attr, 0, PyInt_FromLong(edge->v2) );
@@ -3583,7 +3586,7 @@
 	Mesh *me = self->mesh;
 	
 	if( !face )
-	return NULL; /* error is set */
+		return NULL; /* error is set */
 	
 	if MFACE_VERT_BADRANGE_CHECK(me, face)
 		return EXPP_ReturnPyObjError( PyExc_RuntimeError,

Modified: branches/2-44-stable/blender/source/blender/src/editdeform.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editdeform.c	2007-06-29 08:59:26 UTC (rev 11123)
+++ branches/2-44-stable/blender/source/blender/src/editdeform.c	2007-06-29 13:41:20 UTC (rev 11124)
@@ -330,11 +330,13 @@
 		MDeformVert *dvert= editLatt->dvert;
 		int a, tot;
 		
-		tot= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
-		for(a=0, bp= editLatt->def; a<tot; a++, bp++, dvert++) {
-			for (i=0; i<dvert->totweight; i++){
-				if (dvert->dw[i].def_nr > (ob->actdef-1))
-					dvert->dw[i].def_nr--;
+		if (dvert) {
+			tot= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
+			for(a=0, bp= editLatt->def; a<tot; a++, bp++, dvert++) {
+				for (i=0; i<dvert->totweight; i++){
+					if (dvert->dw[i].def_nr > (ob->actdef-1))
+						dvert->dw[i].def_nr--;
+				}
 			}
 		}
 	}





More information about the Bf-blender-cvs mailing list