aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-10-01 00:44:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 20:59:20 +0200
commitc23d5261f79671a598f32be8bc403552891af24e (patch)
treeab1405c3ad76aab3ff1a5d7968374ccebcf13d66
parent932b5f3cbb22b9357d60914f85675020041299e0 (diff)
downloadffmpeg-c23d5261f79671a598f32be8bc403552891af24e.tar.gz
Check for corrupted data in avs demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 1cce7def0a8eff2e7db294b7d195a0fb1a5043b0)
-rw-r--r--libavformat/avs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avs.c b/libavformat/avs.c
index 355ae31f35..83023790d6 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -163,6 +163,8 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
sub_type = avio_r8(s->pb);
type = avio_r8(s->pb);
size = avio_rl16(s->pb);
+ if (size < 4)
+ return AVERROR_INVALIDDATA;
avs->remaining_frame_size -= size;
switch (type) {