diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-02-10 22:28:16 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-02-10 22:28:16 +0000 |
| commit | f93674fb9c909f272a86347b86ddff7a7974bcb5 (patch) | |
| tree | 1f336bdf421fdeb33c8a96c10346160f2f5235a4 /multimedia/mythtv/files/patch-CVE-2017-05024 | |
| parent | Add upstream patch to fix crasher in the unstable version of gnome-builder. (diff) | |
multimedia/mythtv: Update to 30.0 and unbreak
Changes: https://www.mythtv.org/wiki/Release_Notes_-_30
PR: 234551
Submitted by: fernando.e.vilas@gmail.com
Diffstat (limited to 'multimedia/mythtv/files/patch-CVE-2017-05024')
| -rw-r--r-- | multimedia/mythtv/files/patch-CVE-2017-05024 | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/multimedia/mythtv/files/patch-CVE-2017-05024 b/multimedia/mythtv/files/patch-CVE-2017-05024 deleted file mode 100644 index 8df4a058c343..000000000000 --- a/multimedia/mythtv/files/patch-CVE-2017-05024 +++ /dev/null @@ -1,31 +0,0 @@ -From ed2572b9c8f885e2a4764d2e34604442a71899a1 Mon Sep 17 00:00:00 2001 -From: Matt Wolenetz <wolenetz@google.com> -Date: Wed, 14 Dec 2016 15:26:19 -0800 -Subject: [PATCH] lavf/mov.c: Avoid heap allocation wrap in mov_read_uuid - -Core of patch is from paul@paulmehta.com -Reference https://crbug.com/643951 - -Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> -Check value reduced as the code does not support values beyond INT_MAX -Also the check is moved to a more common place and before integer truncation - -(cherry picked from commit 2d453188c2303da641dafb048dc1806790526dfd) -Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> ---- - libavformat/mov.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git libavformat/mov.c libavformat/mov.c -index 17d0475aae1..74b58255784 100644 ---- external/FFmpeg/libavformat/mov.c -+++ external/FFmpeg/libavformat/mov.c -@@ -4436,7 +4436,7 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) - 0x9c, 0x71, 0x99, 0x94, 0x91, 0xe3, 0xaf, 0xac - }; - -- if (atom.size < sizeof(uuid) || atom.size == INT64_MAX) -+ if (atom.size < sizeof(uuid) || atom.size >= FFMIN(INT_MAX, SIZE_MAX)) - return AVERROR_INVALIDDATA; - - ret = avio_read(pb, uuid, sizeof(uuid)); |