From b48b7b4109868a8c0ddda090992e936e821c7ea6 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Wed, 17 Aug 2016 15:04:38 -0500 Subject: Squashed 'import-layers/meta-openembedded/' content from commit 247b126 Change-Id: I40827e9ce5fba63f1cca2a0be44976ae8383b4c0 git-subtree-dir: import-layers/meta-openembedded git-subtree-split: 247b1267bbe95719cd4877d2d3cfbaf2a2f4865a Signed-off-by: Patrick Williams --- .../0001-mjpegdec-check-SE.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch (limited to 'import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch') diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-ffmpeg-0.10.13/0001-mjpegdec-check-SE.patch new file mode 100644 index 000000000..d90bafac9 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-multimedia/gstreamer-0.10/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 +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 +--- + 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); + } +-- -- cgit v1.2.1