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

avformat/smacker: Don't allocate arrays separately 

Allocating two arrays with the same number of elements together
simplifies freeing them.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-06-22 04:06:37 +02:00
parent 6e5dbd6268
commit 09a39042db
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/smacker.c
View File

@ -205,13 +205,11 @@ static int smacker_read_header(AVFormatContext *s)
avio_rl32(pb); /* padding */ avio_rl32(pb); /* padding */
/* setup data */ /* setup data */
smk->frm_size = av_malloc_array(smk->frames, sizeof(*smk->frm_size)); smk->frm_size = av_malloc_array(smk->frames, sizeof(*smk->frm_size) +
smk->frm_flags = av_malloc(smk->frames); sizeof(*smk->frm_flags));
if (!smk->frm_size || !smk->frm_flags) { if (!smk->frm_size)
av_freep(&smk->frm_size);
av_freep(&smk->frm_flags);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} smk->frm_flags = (void*)(smk->frm_size + smk->frames);
/* read frame info */ /* read frame info */
for (i = 0; i < smk->frames; i++) { for (i = 0; i < smk->frames; i++) {
@ -225,7 +223,6 @@ static int smacker_read_header(AVFormatContext *s)
ret = avio_read(pb, par->extradata + 16, par->extradata_size - 16); ret = avio_read(pb, par->extradata + 16, par->extradata_size - 16);
if (ret != par->extradata_size - 16) { if (ret != par->extradata_size - 16) {
av_freep(&smk->frm_size); av_freep(&smk->frm_size);
av_freep(&smk->frm_flags);
return AVERROR(EIO); return AVERROR(EIO);
} }
@ -362,7 +359,6 @@ static int smacker_read_close(AVFormatContext *s)
SmackerContext *smk = s->priv_data; SmackerContext *smk = s->priv_data;
av_freep(&smk->frm_size); av_freep(&smk->frm_size);
av_freep(&smk->frm_flags);
return 0; return 0;
} }