[FFmpeg-cvslog] mov: Fix harmless OOB read.

[Dale Curtis]

ffmpeg | branch: master | Dale Curtis <dalecurtis at chromium.org> | Thu Apr 12 18:02:33 2012 -0700| [fd165a0b3166bd4605f4f65197b0d43c9382f3e7] | committer: Michael Niedermayer

mov: Fix harmless OOB read.

Convert key_off initialize to use the same sc->keyframe_count as
used elsewhere in the function.

Signed-off-by: Dale Curtis <dalecurtis at chromium.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd165a0b3166bd4605f4f65197b0d43c9382f3e7
---

 libavformat/mov.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index b4ff1df..ce61250 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1842,7 +1842,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
         unsigned int stts_sample = 0;
         unsigned int sample_size;
         unsigned int distance = 0;
-        int key_off = sc->keyframes && sc->keyframes[0] == 1;
+        int key_off = sc->keyframe_count && sc->keyframes[0] == 1;
 
         current_dts -= sc->dts_shift;