diff options
Diffstat (limited to 'multimedia/mythtv/files/patch-CVE-2017-07862')
-rw-r--r-- | multimedia/mythtv/files/patch-CVE-2017-07862 | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/multimedia/mythtv/files/patch-CVE-2017-07862 b/multimedia/mythtv/files/patch-CVE-2017-07862 new file mode 100644 index 000000000000..29a9aca325fb --- /dev/null +++ b/multimedia/mythtv/files/patch-CVE-2017-07862 @@ -0,0 +1,28 @@ +From a1a14982ec5b9954637cdc9ce8daf01d211e5c79 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michael@niedermayer.cc> +Date: Tue, 7 Feb 2017 15:49:09 +0100 +Subject: [PATCH] avcodec/pictordec: Fix logic error + +Fixes: 559/clusterfuzz-testcase-6424225917173760 + +Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> +(cherry picked from commit 8c2ea3030af7b40a3c4275696fb5c76cdb80950a) +Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> +--- + libavcodec/pictordec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git libavcodec/pictordec.c libavcodec/pictordec.c +index ff6eb7f4fc9..0cfc7858326 100644 +--- external/FFmpeg/libavcodec/pictordec.c ++++ external/FFmpeg/libavcodec/pictordec.c +@@ -142,7 +142,7 @@ static int decode_frame(AVCodecContext *avctx, + + if (av_image_check_size(s->width, s->height, 0, avctx) < 0) + return -1; +- if (s->width != avctx->width && s->height != avctx->height) { ++ if (s->width != avctx->width || s->height != avctx->height) { + ret = ff_set_dimensions(avctx, s->width, s->height); + if (ret < 0) + return ret; |