File 0001-avformat-mov-Fix-DoS-in-read_tfra.patch of Package ffmpeg2.7243

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-avformat-mov-Fix-DoS-in-read_tfra.patch of Package ffmpeg2.7243

From d9cf9f5af82228b588828ae2692acccec588fdac Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Tue, 5 Sep 2017 00:16:29 +0200
Subject: [PATCH] avformat/mov: Fix DoS in read_tfra()

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>
(cherry picked from commit 9cb4eb772839c5e1de2855d126bf74ff16d13382)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/mov.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6b1cee8d6c..90b068f091 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -5873,6 +5873,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);
-- 
2.14.1

Places

File 0001-avformat-mov-Fix-DoS-in-read_tfra.patch of Package ffmpeg2.7243

Places