highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'

Browse Source 
* commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242':
  movenc: Properly free allocated data on failures in mov_write_header

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-27 12:47:04 +02:00
parent ef4fcb30c4 2bbad1f94c
commit da2038221b
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/movenc.c
View File

@@ -3568,6 +3568,32 @@ static void enable_tracks(AVFormatContext *s)
} }
} }
static void mov_free(AVFormatContext *s)
{
MOVMuxContext *mov = s->priv_data;
int i;
if (mov->chapter_track) {
if (mov->tracks[mov->chapter_track].enc)
av_freep(&mov->tracks[mov->chapter_track].enc->extradata);
av_freep(&mov->tracks[mov->chapter_track].enc);
}
for (i = 0; i < mov->nb_streams; i++) {
if (mov->tracks[i].tag == MKTAG('r','t','p',' '))
ff_mov_close_hinting(&mov->tracks[i]);
else if (mov->tracks[i].tag == MKTAG('t','m','c','d') && mov->nb_meta_tmcd)
av_freep(&mov->tracks[i].enc);
av_freep(&mov->tracks[i].cluster);
av_freep(&mov->tracks[i].frag_info);
if (mov->tracks[i].vos_len)
av_freep(&mov->tracks[i].vos_data);
}
av_freep(&mov->tracks);
}
static int mov_write_header(AVFormatContext *s) static int mov_write_header(AVFormatContext *s)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
@@ -3853,7 +3879,7 @@ static int mov_write_header(AVFormatContext *s)
return 0; return 0;
error: error:
av_freep(&mov->tracks); mov_free(s);
return -1; return -1;
} }
@@ -4043,17 +4069,7 @@ static int mov_write_trailer(AVFormatContext *s)
mov_write_mfra_tag(pb, mov); mov_write_mfra_tag(pb, mov);
} }
if (mov->chapter_track) {
if (mov->tracks[mov->chapter_track].enc)
av_freep(&mov->tracks[mov->chapter_track].enc->extradata);
av_freep(&mov->tracks[mov->chapter_track].enc);
}
for (i = 0; i < mov->nb_streams; i++) { for (i = 0; i < mov->nb_streams; i++) {
if (mov->tracks[i].tag == MKTAG('r','t','p',' '))
ff_mov_close_hinting(&mov->tracks[i]);
else if (mov->tracks[i].tag == MKTAG('t','m','c','d') && mov->nb_meta_tmcd)
av_freep(&mov->tracks[i].enc);
if (mov->flags & FF_MOV_FLAG_FRAGMENT && if (mov->flags & FF_MOV_FLAG_FRAGMENT &&
mov->tracks[i].vc1_info.struct_offset && s->pb->seekable) { mov->tracks[i].vc1_info.struct_offset && s->pb->seekable) {
int64_t off = avio_tell(pb); int64_t off = avio_tell(pb);
@@ -4064,14 +4080,9 @@ static int mov_write_trailer(AVFormatContext *s)
avio_seek(pb, off, SEEK_SET); avio_seek(pb, off, SEEK_SET);
} }
} }
av_freep(&mov->tracks[i].cluster);
av_freep(&mov->tracks[i].frag_info);
if (mov->tracks[i].vos_len)
av_freep(&mov->tracks[i].vos_data);
} }
av_freep(&mov->tracks); mov_free(s);
return res; return res;
} }