summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8542.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-8542.patch')
-rw-r--r--meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8542.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8542.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8542.patch
deleted file mode 100644
index ca47c814c..000000000
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/gst-ffmpeg-fix-CVE-2014-8542.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 105654e376a736d243aef4a1d121abebce912e6b Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michaelni@gmx.at>
3Date: Fri, 3 Oct 2014 04:30:58 +0200
4Subject: [PATCH] avcodec/utils: Add case for jv to
5 avcodec_align_dimensions2()
6
7(Upstream commit 105654e376a736d243aef4a1d121abebce912e6b)
8
9Fixes out of array accesses
10Fixes: asan_heap-oob_12304aa_8_asan_heap-oob_4da4f3_300_intro.jv
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/utils.c | 4 ++++
19 1 file changed, 4 insertions(+)
20
21diff --git a/libavcodec/utils.c b/libavcodec/utils.c
22index d4f5532..c2c5579 100644
23--- a/gst-libs/ext/libav/libavcodec/utils.c
24+++ b/gst-libs/ext/libav/libavcodec/utils.c
25@@ -173,6 +173,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int l
26 w_align=4;
27 h_align=4;
28 }
29+ if (s->codec_id == CODEC_ID_JV){
30+ w_align = 8;
31+ h_align = 8;
32+ }
33 break;
34 case PIX_FMT_BGR24:
35 if((s->codec_id == CODEC_ID_MSZH) || (s->codec_id == CODEC_ID_ZLIB)){
36--
371.7.9.5
38