eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat/ffmdec: Check pix_fmt

Browse Source 
Fixes crash
Fixes Ticket5412

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 78baa450d9)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-04-28 22:50:48 +02:00
parent 72d8ce1cf2
commit c57ebf6809
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/ffmdec.c
View File

@@ -26,6 +26,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/pixdesc.h"
#include "avformat.h" #include "avformat.h"
#include "internal.h" #include "internal.h"
#include "ffm.h" #include "ffm.h"
@@ -365,6 +366,11 @@ static int ffm2_read_header(AVFormatContext *s)
codec->height = avio_rb16(pb); codec->height = avio_rb16(pb);
codec->gop_size = avio_rb16(pb); codec->gop_size = avio_rb16(pb);
codec->pix_fmt = avio_rb32(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->qmin = avio_r8(pb);
codec->qmax = avio_r8(pb); codec->qmax = avio_r8(pb);
codec->max_qdiff = avio_r8(pb); codec->max_qdiff = avio_r8(pb);
@@ -556,6 +562,11 @@ static int ffm_read_header(AVFormatContext *s)
codec->height = avio_rb16(pb); codec->height = avio_rb16(pb);
codec->gop_size = avio_rb16(pb); codec->gop_size = avio_rb16(pb);
codec->pix_fmt = avio_rb32(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->qmin = avio_r8(pb);
codec->qmax = avio_r8(pb); codec->qmax = avio_r8(pb);
codec->max_qdiff = avio_r8(pb); codec->max_qdiff = avio_r8(pb);