diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-05-26 17:13:13 +0300 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 10:35:13 +0200 |
| commit | fa01c2614a4e58937cd73d0f5d8b17df935bc5b5 (patch) | |
| tree | f7396d3f5a6031632de8290d4006041ee2e59630 /meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-aacdec-check-channel-count.patch | |
| parent | 175406cdca39bf5b218bb4127a3e9c9bd11b653f (diff) | |
| download | meta-openembedded-fa01c2614a4e58937cd73d0f5d8b17df935bc5b5.tar.gz | |
gstreamear: rename directory to gstreamer-0.10
* gst-plugins-gl: fix the path to a required include
* so that it's clear that the recipes it contains are specific to the
obsolete, unmaintained version of gstreamer.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Diffstat (limited to 'meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-aacdec-check-channel-count.patch')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-aacdec-check-channel-count.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-aacdec-check-channel-count.patch b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-aacdec-check-channel-count.patch new file mode 100644 index 0000000000..7da0e14525 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-aacdec-check-channel-count.patch | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | gst-ffmpeg: aacdec: check channel count | ||
| 2 | |||
| 3 | Prevent out of array accesses | ||
| 4 | |||
| 5 | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind | ||
| 6 | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> | ||
| 7 | (cherry picked from commit 96f452ac647dae33c53c242ef3266b65a9beafb6) | ||
| 8 | |||
| 9 | Upstream-Status: Backport | ||
| 10 | |||
| 11 | Signed-off-by: Yue Tao <yue.tao@windriver.com> | ||
| 12 | --- | ||
| 13 | libavcodec/aacdec.c | 5 +++++ | ||
| 14 | 1 files changed, 5 insertions(+), 0 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c | ||
| 17 | index 239153a..6c17c33 100644 | ||
| 18 | --- a/gst-libs/ext/libav/libavcodec/aacdec.c | ||
| 19 | +++ b/gst-libs/ext/libav/libavcodec/aacdec.c | ||
| 20 | @@ -914,6 +914,11 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) | ||
| 21 | } | ||
| 22 | } | ||
| 23 | |||
| 24 | + if (avctx->channels > MAX_CHANNELS) { | ||
| 25 | + av_log(avctx, AV_LOG_ERROR, "Too many channels\n"); | ||
| 26 | + return AVERROR_INVALIDDATA; | ||
| 27 | + } | ||
| 28 | + | ||
| 29 | AAC_INIT_VLC_STATIC( 0, 304); | ||
| 30 | AAC_INIT_VLC_STATIC( 1, 270); | ||
| 31 | AAC_INIT_VLC_STATIC( 2, 550); | ||
| 32 | -- | ||
| 33 | 1.7.5.4 | ||
| 34 | |||
