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

mov: Save number of stsd elements after stream extradata allocation 

Avoid freeing an unallocated array in mov_read_close() in case
of a malloc failure.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2016-06-29 12:03:59 -04:00
parent 6c445990e6
commit 029cf99c51
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/mov.c
View File

@ -1883,7 +1883,7 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{ {
AVStream *st; AVStream *st;
MOVStreamContext *sc; MOVStreamContext *sc;
int ret; int ret, entries;
if (c->fc->nb_streams < 1) if (c->fc->nb_streams < 1)
return 0; return 0;
@ -1892,13 +1892,14 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_r8(pb); /* version */ avio_r8(pb); /* version */
avio_rb24(pb); /* flags */ avio_rb24(pb); /* flags */
sc->stsd_count = avio_rb32(pb); /* entries */ entries = avio_rb32(pb);
/* Prepare space for hosting multiple extradata. */ /* Prepare space for hosting multiple extradata. */
sc->extradata = av_mallocz_array(sc->stsd_count, sizeof(*sc->extradata)); sc->extradata = av_mallocz_array(entries, sizeof(*sc->extradata));
if (!sc->extradata) if (!sc->extradata)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
sc->stsd_count = entries;
sc->extradata_size = av_mallocz_array(sc->stsd_count, sizeof(sc->extradata_size)); sc->extradata_size = av_mallocz_array(sc->stsd_count, sizeof(sc->extradata_size));
if (!sc->extradata_size) if (!sc->extradata_size)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);