[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60740] trunk/blender/source/blender/ blenkernel/intern/armature.c: fix for array index use before checking range

[Campbell Barton]

Revision: 60740
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60740
Author:   campbellbarton
Date:     2013-10-14 07:10:38 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
fix for array index use before checking range

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/armature.c

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c   2013-10-13 
23:45:41 UTC (rev 60739)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c   2013-10-14 
07:10:38 UTC (rev 60740)
@@ -405,7 +405,7 @@
                dist = ((float)a) * ddist;
 
                /* we're looking for location (distance) 'dist' in the array */
-               while ((dist >= pdist[nr]) && nr < MAX_BBONE_SUBDIV)
+               while ((nr < MAX_BBONE_SUBDIV) && (dist >= pdist[nr]))
                        nr++;
 
                fac1 = pdist[nr] - pdist[nr - 1];

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs