diff mbox

[FFmpeg-devel,1/2] avformat/mov: Fix DoS in read_tfra()

Message ID 20170905005526.19078-1-michael@niedermayer.cc
State Accepted
Commit 9cb4eb772839c5e1de2855d126bf74ff16d13382
Headers show

Commit Message

Michael Niedermayer Sept. 5, 2017, 12:55 a.m. UTC 
Fixes: Missing EOF check in loop
No testcase

Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/mov.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Michael Niedermayer Sept. 7, 2017, 11:03 a.m. UTC | #1 
On Tue, Sep 05, 2017 at 02:55:25AM +0200, Michael Niedermayer wrote:
> Fixes: Missing EOF check in loop
> No testcase
> 
> Found-by: Xiaohei and Wangchu from Alibaba Security Team
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/mov.c | 7 +++++++
>  1 file changed, 7 insertions(+)

patchset applied

[...]
diff mbox

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 994e9c6eba..2519707345 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -6094,6 +6094,13 @@  static int read_tfra(MOVContext *mov, AVIOContext *f)
     }
     for (i = 0; i < index->item_count; i++) {
         int64_t time, offset;
+
+        if (avio_feof(f)) {
+            index->item_count = 0;
+            av_freep(&index->items);
+            return AVERROR_INVALIDDATA;
+        }
+
         if (version == 1) {
             time   = avio_rb64(f);
             offset = avio_rb64(f);