aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-10-01 00:44:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-01 20:59:28 +0200
commitfa79af68453b810af94ccb0260ab38ba7b9bb04c (patch)
tree83d1f688ad1fe779d74b0b1c8381078f5a237612
parentc23d5261f79671a598f32be8bc403552891af24e (diff)
downloadffmpeg-fa79af68453b810af94ccb0260ab38ba7b9bb04c.tar.gz
Check for out of bound writes in the avs demuxer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5d44c061cf511d97be5fac8d76be2f3915c6e798)
-rw-r--r--libavformat/avs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/avs.c b/libavformat/avs.c
index 83023790d6..127639e7ee 100644
--- a/libavformat/avs.c
+++ b/libavformat/avs.c
@@ -169,6 +169,8 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
switch (type) {
case AVS_PALETTE:
+ if (size - 4 > sizeof(palette))
+ return AVERROR_INVALIDDATA;
ret = avio_read(s->pb, palette, size - 4);
if (ret < size - 4)
return AVERROR(EIO);