From 78baa450d9939957f52d5187beb95d763d2f1f18 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 28 Apr 2016 22:50:48 +0200 Subject: avformat/ffmdec: Check pix_fmt Fixes crash Fixes Ticket5412 Signed-off-by: Michael Niedermayer --- libavformat/ffmdec.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'libavformat/ffmdec.c') diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 53a9f1fca9..16ba8ecf58 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -27,6 +27,7 @@ #include "libavutil/opt.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/pixdesc.h" #include "avformat.h" #include "internal.h" #include "ffm.h" @@ -381,6 +382,11 @@ static int ffm2_read_header(AVFormatContext *s) codec->height = avio_rb16(pb); codec->gop_size = avio_rb16(pb); codec->pix_fmt = avio_rb32(pb); + if (!av_pix_fmt_desc_get(codec->pix_fmt)) { + av_log(s, AV_LOG_ERROR, "Invalid pix fmt id: %d\n", codec->pix_fmt); + codec->pix_fmt = AV_PIX_FMT_NONE; + goto fail; + } codec->qmin = avio_r8(pb); codec->qmax = avio_r8(pb); codec->max_qdiff = avio_r8(pb); @@ -576,6 +582,11 @@ static int ffm_read_header(AVFormatContext *s) codec->height = avio_rb16(pb); codec->gop_size = avio_rb16(pb); codec->pix_fmt = avio_rb32(pb); + if (!av_pix_fmt_desc_get(codec->pix_fmt)) { + av_log(s, AV_LOG_ERROR, "Invalid pix fmt id: %d\n", codec->pix_fmt); + codec->pix_fmt = AV_PIX_FMT_NONE; + goto fail; + } codec->qmin = avio_r8(pb); codec->qmax = avio_r8(pb); codec->max_qdiff = avio_r8(pb); -- cgit v1.2.3