mirror of https://git.ffmpeg.org/ffmpeg.git
4xmdemux: prevent use of uninitialized memory
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
This commit is contained in:
parent
8d518a9c4f
commit
79964745b3
|
@ -173,13 +173,15 @@ static int fourxm_read_header(AVFormatContext *s,
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
if (current_track + 1 > fourxm->track_count) {
|
if (current_track + 1 > fourxm->track_count) {
|
||||||
fourxm->track_count = current_track + 1;
|
|
||||||
fourxm->tracks = av_realloc(fourxm->tracks,
|
fourxm->tracks = av_realloc(fourxm->tracks,
|
||||||
fourxm->track_count * sizeof(AudioTrack));
|
(current_track + 1) * sizeof(AudioTrack));
|
||||||
if (!fourxm->tracks) {
|
if (!fourxm->tracks) {
|
||||||
ret= AVERROR(ENOMEM);
|
ret = AVERROR(ENOMEM);
|
||||||
goto fail;
|
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].adpcm = AV_RL32(&header[i + 12]);
|
||||||
fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]);
|
fourxm->tracks[current_track].channels = AV_RL32(&header[i + 36]);
|
||||||
|
|
Loading…
Reference in New Issue