RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tta: Add some safety precautions to avoid freeing things that have not been allocated. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-02-11 02:06:24 +01:00
parent c6abf21492
commit ed83f97235
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/tta.c
View File

@ -283,7 +283,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
s->decode_buffer = av_mallocz(sizeof(int32_t)*s->frame_length*s->channels);
if (!s->decode_buffer)
return AVERROR(ENOMEM);
}
} else
s->decode_buffer = NULL;
s->ch_ctx = av_malloc(avctx->channels * sizeof(*s->ch_ctx));
if (!s->ch_ctx) {
av_freep(&s->decode_buffer);
@ -449,7 +450,9 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
static av_cold int tta_decode_close(AVCodecContext *avctx) {
TTAContext *s = avctx->priv_data;
av_free(s->decode_buffer);
if (s->bps < 3)
av_free(s->decode_buffer);
s->decode_buffer = NULL;
av_freep(&s->ch_ctx);
return 0;