From a1876e0072aa0c69f037e0cafaca1a54bf2e189b Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sun, 2 Oct 2011 00:38:26 +0200 Subject: Fix use of uninitialized memory in 4X Technologies demuxer. Signed-off-by: Michael Niedermayer --- libavformat/4xm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavformat/4xm.c') diff --git a/libavformat/4xm.c b/libavformat/4xm.c index cd4066d..f535c49 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -173,14 +173,16 @@ static int fourxm_read_header(AVFormatContext *s, goto fail; } if (current_track + 1 > fourxm->track_count) { - fourxm->track_count = current_track + 1; fourxm->tracks = av_realloc_f(fourxm->tracks, sizeof(AudioTrack), - fourxm->track_count); + current_track + 1); if (!fourxm->tracks) { ret= AVERROR(ENOMEM); goto fail; } + memset(&fourxm->tracks[fourxm->track_count], 0, + sizeof(AudioTrack) * (current_track + 1 - fourxm->track_count)); + fourxm->track_count = current_track + 1; } fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]); fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]); -- cgit v1.1