From df037fe107ccfae4b26ee0e46b638b052f6e49f8 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 13 Jun 2015 00:27:21 +0200 Subject: avcodec/smvjpegdec: assert that the pixel format that has been set by our decoder is valid If we do check av_pix_fmt_desc_get() then we should fail and not continue with an invalid pix_fmt Signed-off-by: Michael Niedermayer --- libavcodec/smvjpegdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/smvjpegdec.c') diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 45faff29fc..9c2fb380e1 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -164,7 +164,9 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz return AVERROR(EINVAL); desc = av_pix_fmt_desc_get(s->avctx->pix_fmt); - if (desc && mjpeg_data->height % (s->frames_per_jpeg << desc->log2_chroma_h)) { + av_assert0(desc); + + if (mjpeg_data->height % (s->frames_per_jpeg << desc->log2_chroma_h)) { av_log(avctx, AV_LOG_ERROR, "Invalid height\n"); return AVERROR_INVALIDDATA; } -- cgit v1.2.1