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

Fix memleak of header in error returns.

Browse Source 
Originally committed as revision 16831 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-01-27 21:06:19 +00:00
parent 59afda9f61
commit cc988dd77f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/4xm.c
View File

@ -121,8 +121,10 @@ static int fourxm_read_header(AVFormatContext *s,
header = av_malloc(header_size); header = av_malloc(header_size);
if (!header) if (!header)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
if (get_buffer(pb, header, header_size) != header_size) if (get_buffer(pb, header, header_size) != header_size){
av_free(header);
return AVERROR(EIO); return AVERROR(EIO);
}
/* take the lazy approach and search for any and all vtrk and strk chunks */ /* take the lazy approach and search for any and all vtrk and strk chunks */
for (i = 0; i < header_size - 8; i++) { for (i = 0; i < header_size - 8; i++) {
@ -142,8 +144,10 @@ static int fourxm_read_header(AVFormatContext *s,
/* allocate a new AVStream */ /* allocate a new AVStream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st){
av_free(header);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
av_set_pts_info(st, 60, 1, fourxm->fps); av_set_pts_info(st, 60, 1, fourxm->fps);
fourxm->video_stream_index = st->index; fourxm->video_stream_index = st->index;
@ -166,8 +170,10 @@ static int fourxm_read_header(AVFormatContext *s,
current_track = AV_RL32(&header[i + 8]); current_track = AV_RL32(&header[i + 8]);
if (current_track + 1 > fourxm->track_count) { if (current_track + 1 > fourxm->track_count) {
fourxm->track_count = current_track + 1; fourxm->track_count = current_track + 1;
if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack)) if((unsigned)fourxm->track_count >= UINT_MAX / sizeof(AudioTrack)){
av_free(header);
return -1; return -1;
}
fourxm->tracks = av_realloc(fourxm->tracks, fourxm->tracks = av_realloc(fourxm->tracks,
fourxm->track_count * sizeof(AudioTrack)); fourxm->track_count * sizeof(AudioTrack));
if (!fourxm->tracks) { if (!fourxm->tracks) {
@ -183,8 +189,10 @@ static int fourxm_read_header(AVFormatContext *s,
/* allocate a new AVStream */ /* allocate a new AVStream */
st = av_new_stream(s, current_track); st = av_new_stream(s, current_track);
if (!st) if (!st){
av_free(header);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
av_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate); av_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate);