generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mov: prevent double free if the caller replaces the io context.

Browse Source 
Fixes Ticket2148

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-22 05:15:47 +01:00
parent b3ab281027
commit 0a84174f2d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.h
View File

@ -94,6 +94,7 @@ typedef struct MOVSbgp {
typedef struct MOVStreamContext { typedef struct MOVStreamContext {
AVIOContext *pb; AVIOContext *pb;
int pb_is_copied;
int ffindex; ///< AVStream index int ffindex; ///< AVStream index
int next_chunk; int next_chunk;
unsigned int chunk_count; unsigned int chunk_count;

6
libavformat/mov.c
View File

@ -2230,8 +2230,10 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
"filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n", "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n",
st->index, dref->path, dref->dir, dref->filename, st->index, dref->path, dref->dir, dref->filename,
dref->volume, dref->nlvl_from, dref->nlvl_to); dref->volume, dref->nlvl_from, dref->nlvl_to);
} else } else {
sc->pb = c->fc->pb; sc->pb = c->fc->pb;
sc->pb_is_copied = 1;
}
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
if (!st->sample_aspect_ratio.num && if (!st->sample_aspect_ratio.num &&
@ -3071,7 +3073,7 @@ static int mov_read_close(AVFormatContext *s)
av_freep(&sc->drefs[j].dir); av_freep(&sc->drefs[j].dir);
} }
av_freep(&sc->drefs); av_freep(&sc->drefs);
if (sc->pb && sc->pb != s->pb) if (!sc->pb_is_copied)
avio_close(sc->pb); avio_close(sc->pb);
sc->pb = NULL; sc->pb = NULL;
av_freep(&sc->chunk_offsets); av_freep(&sc->chunk_offsets);