aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/flvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-29 23:22:41 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-30 04:29:54 +0100
commitdf0bff6643cadbd9c07bbe2b0536a7c9d0dfe0c6 (patch)
tree557349a40b68a369881789fedb2e39a398cfec7c /libavformat/flvdec.c
parent00c0465dbc5acd27c736d612bbad95fdbe2ef96c (diff)
downloadffmpeg-df0bff6643cadbd9c07bbe2b0536a7c9d0dfe0c6.tar.gz
flvdec: Check index for being valid
Fixes seeking in Enigma_Principles_of_Lust.flv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
-rw-r--r--libavformat/flvdec.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 57ef06126a..2e5032095e 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -200,7 +200,16 @@ static int parse_keyframes_index(AVFormatContext *s, AVIOContext *ioc, AVStream
}
}
- if (timeslen == fileposlen && fileposlen && max_pos <= filepositions[0]) {
+ if (timeslen == fileposlen && fileposlen>1 && max_pos <= filepositions[0]) {
+ int64_t dts, size0, size1;
+ avio_seek(ioc, filepositions[1]-4, SEEK_SET);
+ size0 = avio_rb32(ioc);
+ avio_r8(ioc);
+ size1 = avio_rb24(ioc);
+ dts = avio_rb24(ioc);
+ dts |= avio_r8(ioc) << 24;
+ if (size0 > filepositions[1] || FFABS(dts - times[1]*1000)>5000)
+ goto finish;
for(i = 0; i < timeslen; i++)
av_add_index_entry(vstream, filepositions[i], times[i]*1000, 0, 0, AVINDEX_KEYFRAME);
} else