diff mbox series

[FFmpeg-devel,2/2] avformat/mov: validate box size for stts

Message ID 20211222113033.7132-2-ffmpeg@gyani.pro
State New
Headers show
Series [FFmpeg-devel,1/2] avformat/mov: add validate_box_size | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Gyan Doshi Dec. 22, 2021, 11:30 a.m. UTC 
---
 libavformat/mov.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2cc9e699de..59ee7ed2a9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2967,6 +2967,12 @@  static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     avio_rb24(pb); /* flags */
     entries = avio_rb32(pb);
 
+    if (validate_box_size(c, atom, pb, avio_tell(pb)-8, 8+(int64_t)entries*8, 0)) {
+        av_log(c->fc, AV_LOG_ERROR, "Invalid or incomplete %s box in stream %d\n",
+               av_fourcc2str(atom.type), c->fc->nb_streams-1);
+       return AVERROR_INVALIDDATA;
+    }
+
     av_log(c->fc, AV_LOG_TRACE, "track[%u].stts.entries = %u\n",
             c->fc->nb_streams-1, entries);