[FFmpeg-cvslog] flvdec: Fix invalid pointer deferences when parsing index

[Laurent Aimar]

ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Sat Sep 24 16:16:38 2011 +0200| [74f4c1358c27d168bd346d3d3db6a097b9f71558] | committer: Reinhard Tartler

flvdec: Fix invalid pointer deferences when parsing index

Signed-off-by: Martin Storsjö <martin at martin.st>
(cherry picked from commit 2b4e49d4281690db67073ba644ad2ffc17767cdf)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

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

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 5f442f7..a07ac60 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -185,8 +185,8 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, AVStream
         }
     }
 
-    if (timeslen == fileposlen)
-         for(i = 0; i < arraylen; i++)
+    if (!ret && timeslen == fileposlen)
+         for (i = 0; i < fileposlen; i++)
              av_add_index_entry(vstream, filepositions[i], times[i]*1000, 0, 0, AVINDEX_KEYFRAME);
     else
         av_log(s, AV_LOG_WARNING, "Invalid keyframes object, skipping.\n");