aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-28 23:46:04 +0300
committerLuca Barbato <lu_zero@gentoo.org>2013-10-04 03:52:09 +0200
commit10f384e4f5d0ee692cacaf90d629d8bc2178b092 (patch)
tree3b3b51cadae57b9611dc5dffbbb47e48f74343b1
parentad1223d6bcc69e1639951aedcdae40822bf41042 (diff)
downloadffmpeg-10f384e4f5d0ee692cacaf90d629d8bc2178b092.tar.gz
bfi: Add some very basic sanity checks for input packet sizes
CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 640a2427aafa774b83316b7a8c5c2bdc28bfd269) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavformat/bfi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index 5d7ccb85e6..19060e760f 100644
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -132,6 +132,10 @@ static int bfi_read_packet(AVFormatContext * s, AVPacket * pkt)
video_offset = avio_rl32(pb);
audio_size = video_offset - audio_offset;
bfi->video_size = chunk_size - video_offset;
+ if (audio_size < 0 || bfi->video_size < 0) {
+ av_log(s, AV_LOG_ERROR, "Invalid audio/video offsets or chunk size\n");
+ return AVERROR_INVALIDDATA;
+ }
//Tossing an audio packet at the audio decoder.
ret = av_get_packet(pb, pkt, audio_size);