RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/hnm: Check for extradata allocation failure 

and also add padding to it; moreover, don't use memcpy to write one byte
to extradata.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9e0f3352d1)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 07:31:17 +01:00
parent 590a168cf9
commit a92b9ed7e3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/hnm.c
View File

@ -70,6 +70,7 @@ static int hnm_read_header(AVFormatContext *s)
Hnm4DemuxContext *hnm = s->priv_data; Hnm4DemuxContext *hnm = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *vst; AVStream *vst;
int ret;
/* default context members */ /* default context members */
hnm->pts = 0; hnm->pts = 0;
@ -113,10 +114,10 @@ static int hnm_read_header(AVFormatContext *s)
vst->codecpar->codec_tag = 0; vst->codecpar->codec_tag = 0;
vst->codecpar->width = hnm->width; vst->codecpar->width = hnm->width;
vst->codecpar->height = hnm->height; vst->codecpar->height = hnm->height;
vst->codecpar->extradata = av_mallocz(1); if ((ret = ff_alloc_extradata(vst->codecpar, 1)) < 0)
return ret;
vst->codecpar->extradata_size = 1; vst->codecpar->extradata[0] = hnm->version;
memcpy(vst->codecpar->extradata, &hnm->version, 1);
vst->start_time = 0; vst->start_time = 0;