summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8545.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8545.patch')
-rw-r--r--meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8545.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8545.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8545.patch
deleted file mode 100644
index 29d5f776a..000000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8545.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 3e2b745020c2dbf0201fe7df3dad9e7e0b2e1bb6 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michaelni@gmx.at>
3Date: Fri, 3 Oct 2014 17:35:58 +0200
4Subject: [PATCH] avcodec/pngdec: Check bits per pixel before setting
5 monoblack pixel format
6
7(Upstream commit 3e2b745020c2dbf0201fe7df3dad9e7e0b2e1bb6)
8
9Fixes out of array accesses
10Fixes: asan_heap-oob_14dbfcf_4_asan_heap-oob_1ce5767_179_add_method_small.png
11
12Upstream-Status: Backport
13
14Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
15Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
16Signed-off-by: Yue Tao <yue.tao@windriver.com>
17---
18 libavcodec/pngdec.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
22index da91aab..f3603b3 100644
23--- a/gst-libs/ext/libav/libavcodec/pngdec.c
24+++ b/gst-libs/ext/libav/libavcodec/pngdec.c
25@@ -481,7 +481,7 @@ static int decode_frame(AVCodecContext *avctx,
26 } else if (s->bit_depth == 16 &&
27 s->color_type == PNG_COLOR_TYPE_RGB) {
28 avctx->pix_fmt = PIX_FMT_RGB48BE;
29- } else if (s->bit_depth == 1 &&
30+ } else if (s->bit_depth == 1 && s->bits_per_pixel == 1 &&
31 s->color_type == PNG_COLOR_TYPE_GRAY) {
32 avctx->pix_fmt = PIX_FMT_MONOBLACK;
33 } else if (s->color_type == PNG_COLOR_TYPE_PALETTE) {
34--
351.7.9.5
36