diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 01:32:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-15 01:34:14 +0100 |
| commit | 2b31a9c613f95383d5106f8c1cbcee8eb291090f (patch) | |
| tree | 649d50ce5610c633ee2af6f54844e1701034abd8 /libavformat | |
| parent | b2361cfb94738298a6c4037cc348fe5015efb841 (diff) | |
| download | ffmpeg-streaming-2b31a9c613f95383d5106f8c1cbcee8eb291090f.zip ffmpeg-streaming-2b31a9c613f95383d5106f8c1cbcee8eb291090f.tar.gz | |
avformat/iff: shrink packets to the initialized data
Fixes use of uninitialized data
Fixes: msan_uninit-mem_7f65b9788da6_388_24.iff
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/iff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c index edf308b..03c4b08 100644 --- a/libavformat/iff.c +++ b/libavformat/iff.c @@ -462,6 +462,8 @@ static int iff_read_packet(AVFormatContext *s, buf = pkt->data; bytestream_put_be16(&buf, 2); ret = avio_read(pb, buf, iff->body_size); + if (ret>=0 && ret < iff->body_size) + av_shrink_packet(pkt, ret + 2); } else { av_assert0(0); } |
