diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 20:36:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-07 20:39:05 +0200 |
| commit | 467e7a8f26e54c300ba494bf00033fec1078fa45 (patch) | |
| tree | 47e3638b4b0c55021da8056d9370d315b5e74340 | |
| parent | 0ea135613788ef69ee4f52afb520a169e6da6b9e (diff) | |
| download | ffmpeg-467e7a8f26e54c300ba494bf00033fec1078fa45.tar.gz | |
avcodec/smvjpegdec: check that frames_per_jpeg cleanly divides height
Fixes out of array access
If some valid files fail this check then please open a ticket and ping me and the smvjpegdec maintainer.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/smvjpegdec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 81ac08b180..efd2fa25d8 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -124,6 +124,7 @@ static av_cold int smvjpeg_decode_init(AVCodecContext *avctx) static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) { + const AVPixFmtDescriptor *desc; SMVJpegDecodeContext *s = avctx->priv_data; AVFrame* mjpeg_data = s->picture[0]; int i, cur_frame = 0, ret = 0; @@ -134,6 +135,12 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz if (!cur_frame) ret = avcodec_decode_video2(s->avctx, mjpeg_data, &s->mjpeg_data_size, avpkt); + desc = av_pix_fmt_desc_get(s->avctx->pix_fmt); + if (desc && mjpeg_data->height % (s->frames_per_jpeg << desc->log2_chroma_h)) { + av_log(avctx, AV_LOG_ERROR, "Invalid height\n"); + return AVERROR_INVALIDDATA; + } + /*use the last lot... */ *data_size = s->mjpeg_data_size; |