Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix read past end of array when drawing tracking markers keyframes

Browse Source 
Was introduced by plane track merge.
This commit is contained in:
Sergey Sharybin
2013-08-19 11:36:29 +00:00
parent 400bd9bfba
commit 4da3d5bcda
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/space_clip/clip_draw.c
View File

@@ -127,9 +127,11 @@ static int generic_track_get_marker_framenr(MovieTrackingTrack *track, MovieTrac
int marker_index) int marker_index)
{ {
if (track) { if (track) {
BLI_assert(marker_index < track->markersnr);
return track->markers[marker_index].framenr; return track->markers[marker_index].framenr;
} }
else if (plane_track) { else if (plane_track) {
BLI_assert(marker_index < plane_track->markersnr);
return plane_track->markers[marker_index].framenr; return plane_track->markers[marker_index].framenr;
} }
@@ -140,6 +142,7 @@ static bool generic_track_is_marker_enabled(MovieTrackingTrack *track, MovieTrac
int marker_index) int marker_index)
{ {
if (track) { if (track) {
BLI_assert(marker_index < track->markersnr);
return (track->markers[marker_index].flag & MARKER_DISABLED) == 0; return (track->markers[marker_index].flag & MARKER_DISABLED) == 0;
} }
else if (plane_track) { else if (plane_track) {
@@ -153,9 +156,11 @@ static bool generic_track_is_marker_keyframed(MovieTrackingTrack *track, MovieTr
int marker_index) int marker_index)
{ {
if (track) { if (track) {
BLI_assert(marker_index < track->markersnr);
return (track->markers[marker_index].flag & MARKER_TRACKED) == 0; return (track->markers[marker_index].flag & MARKER_TRACKED) == 0;
} }
else if (plane_track) { else if (plane_track) {
BLI_assert(marker_index < plane_track->markersnr);
return (plane_track->markers[marker_index].flag & PLANE_MARKER_TRACKED) == 0; return (plane_track->markers[marker_index].flag & PLANE_MARKER_TRACKED) == 0;
} }
@@ -212,6 +217,8 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
a++; a++;
} }
a = min_ii(a, markersnr - 1);
if (generic_track_is_marker_enabled(act_track, act_plane_track, a)) { if (generic_track_is_marker_enabled(act_track, act_plane_track, a)) {
framenr = generic_track_get_marker_framenr(act_track, act_plane_track, a); framenr = generic_track_get_marker_framenr(act_track, act_plane_track, a);