[FFmpeg-devel] [PATCH 1/4] mov: abort on EOF in ff_mov_read_chan
Andreas Cadhalpun
andreas.cadhalpun at googlemail.com
Sun May 24 00:04:08 CEST 2015
Otherwise the loop can take a lot of time if num_descr is very large.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
---
libavformat/mov_chan.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c
index e36034e..a2fa8d6 100644
--- a/libavformat/mov_chan.c
+++ b/libavformat/mov_chan.c
@@ -566,6 +566,11 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
label_mask = 0;
for (i = 0; i < num_descr; i++) {
uint32_t label;
+ if (pb->eof_reached) {
+ av_log(s, AV_LOG_ERROR,
+ "reached EOF while reading channel layout\n");
+ return AVERROR_INVALIDDATA;
+ }
label = avio_rb32(pb); // mChannelLabel
avio_rb32(pb); // mChannelFlags
avio_rl32(pb); // mCoordinates[0]
--
2.1.4
More information about the ffmpeg-devel
mailing list