virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/mov: Increment stsd_count while processing stsd data; avoids leaks.

Browse Source 
In the event of ff_mov_read_stsd_entries() failure, sc->stsd_count
is not updated, even if the function allocates extradata memory.
Instead update the sc->stsd_count as entries are parsed so that
mov_read_close() can do the right thing.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Dale Curtis
2017-11-21 15:40:22 -08:00
committed by Michael Niedermayer
parent 3d5822d9cf
commit 6db511a783
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mov.c
View File

@@ -2464,8 +2464,10 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
} }
if (mov_skip_multiple_stsd(c, pb, st->codecpar->codec_tag, format, if (mov_skip_multiple_stsd(c, pb, st->codecpar->codec_tag, format,
size - (avio_tell(pb) - start_pos))) size - (avio_tell(pb) - start_pos))) {
sc->stsd_count++;
continue; continue;
}
sc->pseudo_stream_id = st->codecpar->codec_tag ? -1 : pseudo_stream_id; sc->pseudo_stream_id = st->codecpar->codec_tag ? -1 : pseudo_stream_id;
sc->dref_id= dref_id; sc->dref_id= dref_id;
@@ -2517,6 +2519,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
av_freep(&st->codecpar->extradata); av_freep(&st->codecpar->extradata);
st->codecpar->extradata_size = 0; st->codecpar->extradata_size = 0;
} }
sc->stsd_count++;
} }
if (pb->eof_reached) if (pb->eof_reached)
@@ -2566,8 +2569,6 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
sc->stsd_count = entries;
/* Restore back the primary extradata. */ /* Restore back the primary extradata. */
av_freep(&st->codecpar->extradata); av_freep(&st->codecpar->extradata);
st->codecpar->extradata_size = sc->extradata_size[0]; st->codecpar->extradata_size = sc->extradata_size[0];