[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11125] trunk/blender/source/blender: same as 2.44 stable - missing NULL checks.

Campbell Barton cbarton at metavr.com
Sat Jun 30 02:25:56 CEST 2007


Should lattice lattice->dvert be able to be NULL?

When you add a new group (its null) but pressing assign, even when no 
verts are selected creates lattice->dvert and all the edges render Blue.

I thrashed about a bit and wasnt able to crash it so I guess its ok, but 
  it should probably be looked into.


Campbell Barton wrote:
> Revision: 11125
>           http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11125
> Author:   campbellbarton
> Date:     2007-06-29 15:46:15 +0200 (Fri, 29 Jun 2007)
> 
> Log Message:
> -----------
> same as 2.44 stable - missing NULL checks.
> 
> Modified Paths:
> --------------
>     trunk/blender/source/blender/python/api2_2x/Mesh.c
>     trunk/blender/source/blender/src/editdeform.c
> 
> Modified: trunk/blender/source/blender/python/api2_2x/Mesh.c
> ===================================================================
> --- trunk/blender/source/blender/python/api2_2x/Mesh.c	2007-06-29 13:41:20 UTC (rev 11124)
> +++ trunk/blender/source/blender/python/api2_2x/Mesh.c	2007-06-29 13:46:15 UTC (rev 11125)
> @@ -2542,6 +2542,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_SET_ITEM( attr, 0, PyInt_FromLong(edge->v2) );
> 
> Modified: trunk/blender/source/blender/src/editdeform.c
> ===================================================================
> --- trunk/blender/source/blender/src/editdeform.c	2007-06-29 13:41:20 UTC (rev 11124)
> +++ trunk/blender/source/blender/src/editdeform.c	2007-06-29 13:46:15 UTC (rev 11125)
> @@ -334,11 +334,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--;
> +				}
>  			}
>  		}
>  	}
> 
> 
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
> 


-- 
Campbell J Barton (ideasman42)


More information about the Bf-committers mailing list