db032688df
Convert multimedia/mythtv-frontend to a slave port of multimedia/mythtv which should make future updates much easier. Upstream security patches have been added to address known vulnerabilities in the bundled ffmpeg 3.2. PR: 225652 (initial patches to update to 29.0) [1] Submitted by: <lucylangthorne55@gmail.com> [1] Differential Revision: https://reviews.freebsd.org/D14563
28 lines
1 KiB
Text
28 lines
1 KiB
Text
From b2c9771dd435fbce4f0a422bbdc16ecf7b243395 Mon Sep 17 00:00:00 2001
|
|
From: Michael Niedermayer <michael@niedermayer.cc>
|
|
Date: Mon, 9 Oct 2017 00:32:30 +0200
|
|
Subject: [PATCH] avcodec/mpeg_er: Clear mcsel in mpeg_er_decode_mb()
|
|
|
|
Fixes out of array read
|
|
Should fix: 3516/clusterfuzz-testcase-minimized-4608518562775040 (not reprodoceable)
|
|
|
|
Found-by: Insu Yun, Georgia Tech.
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
(cherry picked from commit 127a362630e11fe724e2e63fc871791fdcbcfa64)
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
---
|
|
libavcodec/mpeg_er.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git libavcodec/mpeg_er.c libavcodec/mpeg_er.c
|
|
index dd87ae9cc9e..9bd269c4402 100644
|
|
--- external/FFmpeg/libavcodec/mpeg_er.c
|
|
+++ external/FFmpeg/libavcodec/mpeg_er.c
|
|
@@ -71,6 +71,7 @@ static void mpeg_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type,
|
|
s->mb_skipped = mb_skipped;
|
|
s->mb_x = mb_x;
|
|
s->mb_y = mb_y;
|
|
+ s->mcsel = 0;
|
|
memcpy(s->mv, mv, sizeof(*mv));
|
|
|
|
ff_init_block_index(s);
|