[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57836] trunk/blender/source/blender: IK plugin range check was wrong, could do out of bounds reads.

Campbell Barton ideasman42 at gmail.com
Thu Jun 27 21:52:50 CEST 2013


Revision: 57836
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57836
Author:   campbellbarton
Date:     2013-06-27 19:52:50 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
IK plugin range check was wrong, could do out of bounds reads.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/armature/armature_relations.c
    trunk/blender/source/blender/ikplugin/intern/ikplugin_api.c

Modified: trunk/blender/source/blender/editors/armature/armature_relations.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_relations.c	2013-06-27 19:50:57 UTC (rev 57835)
+++ trunk/blender/source/blender/editors/armature/armature_relations.c	2013-06-27 19:52:50 UTC (rev 57836)
@@ -468,8 +468,8 @@
 	/* TODO: use context iterators for this? */
 	CTX_DATA_BEGIN(C, Base *, base, visible_bases)
 	{
-		if (base->object == obedit) base->flag |= 1;
-		else base->flag &= ~1;
+		if (base->object == obedit) base->flag |= SELECT;
+		else base->flag &= ~SELECT;
 	}
 	CTX_DATA_END;
 	

Modified: trunk/blender/source/blender/ikplugin/intern/ikplugin_api.c
===================================================================
--- trunk/blender/source/blender/ikplugin/intern/ikplugin_api.c	2013-06-27 19:50:57 UTC (rev 57835)
+++ trunk/blender/source/blender/ikplugin/intern/ikplugin_api.c	2013-06-27 19:52:50 UTC (rev 57836)
@@ -86,12 +86,13 @@
 
 static IKPlugin *get_plugin(bPose *pose)
 {
-	if (!pose || pose->iksolver < 0 || pose->iksolver > (sizeof(ikplugin_tab) / sizeof(IKPlugin) - 2))
+	if (!pose || pose->iksolver < 0 || pose->iksolver >= ((sizeof(ikplugin_tab) / sizeof(IKPlugin)) - 1))
 		return NULL;
 
 	return &ikplugin_tab[pose->iksolver];
 }
 
+
 /*----------------------------------------*/
 /* Plugin API							  */
 




More information about the Bf-blender-cvs mailing list