diff options
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch new file mode 100644 index 0000000000..d90bafac91 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch @@ -0,0 +1,32 @@ +From 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer <michaelni@gmx.at> +Date: Sun, 11 Nov 2012 00:01:24 +0100 +Subject: [PATCH] mjpegdec: check SE. + +Upstream-Status: Backport + +Commit 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29 release/1.1 + +Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind +Signed-off-by: Michael Niedermayer <michaelni@gmx.at> +--- + libavcodec/mjpegdec.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c +index 6b5266d..0a71a6f 100644 +--- a/gst-libs/ext/libav/libavcodec/mjpegdec.c ++++ b/gst-libs/ext/libav/libavcodec/mjpegdec.c +@@ -905,6 +905,11 @@ static int mjpeg_decode_scan_progressive + int16_t *quant_matrix = s->quant_matrixes[ s->quant_index[c] ]; + GetBitContext mb_bitmask_gb; + ++ if (se > 63) { ++ av_log(s->avctx, AV_LOG_ERROR, "SE %d is too large\n", se); ++ return AVERROR_INVALIDDATA; ++ } ++ + if (mb_bitmask) { + init_get_bits(&mb_bitmask_gb, mb_bitmask, s->mb_width*s->mb_height); + } +-- diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb index 0d0ba9a3ae..28ea29e41b 100644 --- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb +++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bb @@ -32,6 +32,7 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-pgssubdec-check-RLE-size-before-copying.-Fix-out-of-.patch \ file://0001-atrac3dec-Check-coding-mode-against-channels.patch \ file://0001-eamad-fix-out-of-array-accesses.patch \ + file://0001-mjpegdec-check-SE.patch \ " SRC_URI[md5sum] = "7f5beacaf1312db2db30a026b36888c4" |