[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51111] trunk/blender/source/blender/ editors: fix reading past array bounds for nearest_uv_between() and draw_tracking_tracks().

[Campbell Barton]

Revision: 51111
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51111
Author:   campbellbarton
Date:     2012-10-06 12:00:54 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
fix reading past array bounds for nearest_uv_between() and draw_tracking_tracks().

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_clip/clip_draw.c
    trunk/blender/source/blender/editors/uvedit/uvedit_ops.c

Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c	2012-10-06 11:52:54 UTC (rev 51110)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c	2012-10-06 12:00:54 UTC (rev 51111)
@@ -1126,7 +1126,7 @@
 
 				if (MARKER_VISIBLE(sc, track, marker)) {
 					float npos[2];
-					copy_v4_v4(vec, track->bundle_pos);
+					copy_v3_v3(vec, track->bundle_pos);
 					vec[3] = 1;
 
 					mul_v4_m4v4(pos, mat, vec);

Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-10-06 11:52:54 UTC (rev 51110)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c	2012-10-06 12:00:54 UTC (rev 51111)
@@ -759,14 +759,13 @@
 	BMLoop *l;
 	MLoopUV *luv;
 	BMIter iter;
-	float m[3], v1[3], v2[3], c1, c2, *uv1 = NULL, /* *uv2, */ /* UNUSED */ *uv3 = NULL;
+	float m[2], v1[2], v2[2], c1, c2, *uv1 = NULL, /* *uv2, */ /* UNUSED */ *uv3 = NULL;
 	int id1, id2, i;
 
 	id1 = (id + efa->len - 1) % efa->len;
 	id2 = (id + efa->len + 1) % efa->len;
 
-	m[0] = co[0] - uv[0];
-	m[1] = co[1] - uv[1];
+	sub_v2_v2v2(m, co, uv);
 
 	i = 0;
 	BM_ITER_ELEM (l, &iter, efa, BM_LOOPS_OF_FACE) {
@@ -782,8 +781,8 @@
 		i++;
 	}
 
-	sub_v3_v3v3(v1, uv1, uv);
-	sub_v3_v3v3(v2, uv3, uv);
+	sub_v2_v2v2(v1, uv1, uv);
+	sub_v2_v2v2(v2, uv3, uv);
 
 	/* m and v2 on same side of v-v1? */
 	c1 = v1[0] * m[1] - v1[1] * m[0];