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

Fix memleak of fourxm->tracks on error return.

Browse Source 
Originally committed as revision 16833 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2009-01-27 21:56:28 +00:00
parent 4f989885b6
commit 68e1794e3a
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavformat/4xm.c
View File

@ -99,7 +99,7 @@ static int fourxm_read_header(AVFormatContext *s,
int header_size; int header_size;
FourxmDemuxContext *fourxm = s->priv_data; FourxmDemuxContext *fourxm = s->priv_data;
unsigned char *header; unsigned char *header;
int i; int i, ret;
int current_track = -1; int current_track = -1;
AVStream *st; AVStream *st;
@ -136,8 +136,8 @@ static int fourxm_read_header(AVFormatContext *s,
} else if (fourcc_tag == vtrk_TAG) { } else if (fourcc_tag == vtrk_TAG) {
/* check that there is enough data */ /* check that there is enough data */
if (size != vtrk_SIZE) { if (size != vtrk_SIZE) {
av_free(header); ret= AVERROR_INVALIDDATA;
return AVERROR_INVALIDDATA; goto fail;
} }
fourxm->width = AV_RL32(&header[i + 36]); fourxm->width = AV_RL32(&header[i + 36]);
fourxm->height = AV_RL32(&header[i + 40]); fourxm->height = AV_RL32(&header[i + 40]);
@ -145,8 +145,8 @@ 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); ret= AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
av_set_pts_info(st, 60, 1, fourxm->fps); av_set_pts_info(st, 60, 1, fourxm->fps);
@ -164,21 +164,21 @@ static int fourxm_read_header(AVFormatContext *s,
} else if (fourcc_tag == strk_TAG) { } else if (fourcc_tag == strk_TAG) {
/* check that there is enough data */ /* check that there is enough data */
if (size != strk_SIZE) { if (size != strk_SIZE) {
av_free(header); ret= AVERROR_INVALIDDATA;
return AVERROR_INVALIDDATA; goto fail;
} }
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); ret= -1;
return -1; goto fail;
} }
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) {
av_free(header); ret= AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
} }
fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]); fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]);
@ -190,8 +190,8 @@ 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); ret= AVERROR(ENOMEM);
return AVERROR(ENOMEM); goto fail;
} }
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);
@ -215,18 +215,23 @@ static int fourxm_read_header(AVFormatContext *s,
} }
} }
av_free(header);
/* skip over the LIST-MOVI chunk (which is where the stream should be */ /* skip over the LIST-MOVI chunk (which is where the stream should be */
GET_LIST_HEADER(); GET_LIST_HEADER();
if (fourcc_tag != MOVI_TAG) if (fourcc_tag != MOVI_TAG){
return AVERROR_INVALIDDATA; ret= AVERROR_INVALIDDATA;
goto fail;
}
av_free(header);
/* initialize context members */ /* initialize context members */
fourxm->video_pts = -1; /* first frame will push to 0 */ fourxm->video_pts = -1; /* first frame will push to 0 */
fourxm->audio_pts = 0; fourxm->audio_pts = 0;
return 0; return 0;
fail:
av_freep(&fourxm->tracks);
av_free(header);
return ret;
} }
static int fourxm_read_packet(AVFormatContext *s, static int fourxm_read_packet(AVFormatContext *s,