summaryrefslogtreecommitdiff
path: root/multimedia/mythtv/files/patch-CVE-2017-14056
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/mythtv/files/patch-CVE-2017-14056')
-rw-r--r--multimedia/mythtv/files/patch-CVE-2017-1405645
1 files changed, 0 insertions, 45 deletions
diff --git a/multimedia/mythtv/files/patch-CVE-2017-14056 b/multimedia/mythtv/files/patch-CVE-2017-14056
deleted file mode 100644
index 5cb52a11b395..000000000000
--- a/multimedia/mythtv/files/patch-CVE-2017-14056
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5bc9f70441d7e7067cba9188898c9252c72bab35 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E5=AD=99=E6=B5=A9=20and=20=E5=BC=A0=E6=B4=AA=E4=BA=AE=28?=
- =?UTF-8?q?=E6=9C=9B=E5=88=9D=29?= <tony.sh and wangchu.zhl@alibaba-inc.com>
-Date: Fri, 25 Aug 2017 01:15:29 +0200
-Subject: [PATCH] avformat/rl2: Fix DoS due to lack of eof check
-
-Fixes: loop.rl2
-
-Found-by: Xiaohei and Wangchu from Alibaba Security Team
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-(cherry picked from commit 96f24d1bee7fe7bac08e2b7c74db1a046c9dc0de)
-Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
----
- libavformat/rl2.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git libavformat/rl2.c libavformat/rl2.c
-index 0bec8f1d9ab..eb1682dfcb7 100644
---- external/FFmpeg/libavformat/rl2.c
-+++ external/FFmpeg/libavformat/rl2.c
-@@ -170,12 +170,21 @@ static av_cold int rl2_read_header(AVFormatContext *s)
- }
-
- /** read offset and size tables */
-- for(i=0; i < frame_count;i++)
-+ for(i=0; i < frame_count;i++) {
-+ if (avio_feof(pb))
-+ return AVERROR_INVALIDDATA;
- chunk_size[i] = avio_rl32(pb);
-- for(i=0; i < frame_count;i++)
-+ }
-+ for(i=0; i < frame_count;i++) {
-+ if (avio_feof(pb))
-+ return AVERROR_INVALIDDATA;
- chunk_offset[i] = avio_rl32(pb);
-- for(i=0; i < frame_count;i++)
-+ }
-+ for(i=0; i < frame_count;i++) {
-+ if (avio_feof(pb))
-+ return AVERROR_INVALIDDATA;
- audio_size[i] = avio_rl32(pb) & 0xFFFF;
-+ }
-
- /** build the sample index */
- for(i=0;i<frame_count;i++){