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

vqavideo: check malloc return values

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Paul B Mahol 2012-03-16 13:23:57 +00:00 committed by Ronald S. Bultje
parent d3958ab4ed
commit 341404f753
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/vqavideo.c
View File

@ -158,7 +158,18 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
/* allocate codebooks */ /* allocate codebooks */
s->codebook_size = MAX_CODEBOOK_SIZE; s->codebook_size = MAX_CODEBOOK_SIZE;
s->codebook = av_malloc(s->codebook_size); s->codebook = av_malloc(s->codebook_size);
if (!s->codebook)
goto fail;
s->next_codebook_buffer = av_malloc(s->codebook_size); s->next_codebook_buffer = av_malloc(s->codebook_size);
if (!s->next_codebook_buffer)
goto fail;
/* allocate decode buffer */
s->decode_buffer_size = (s->width / s->vector_width) *
(s->height / s->vector_height) * 2;
s->decode_buffer = av_malloc(s->decode_buffer_size);
if (!s->decode_buffer)
goto fail;
/* initialize the solid-color vectors */ /* initialize the solid-color vectors */
if (s->vector_height == 4) { if (s->vector_height == 4) {
@ -174,14 +185,14 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
} }
s->next_codebook_buffer_index = 0; s->next_codebook_buffer_index = 0;
/* allocate decode buffer */
s->decode_buffer_size = (s->width / s->vector_width) *
(s->height / s->vector_height) * 2;
s->decode_buffer = av_malloc(s->decode_buffer_size);
s->frame.data[0] = NULL; s->frame.data[0] = NULL;
return 0; return 0;
fail:
av_freep(&s->codebook);
av_freep(&s->next_codebook_buffer);
av_freep(&s->decode_buffer);
return AVERROR(ENOMEM);
} }
#define CHECK_COUNT() \ #define CHECK_COUNT() \
@ -589,9 +600,9 @@ static av_cold int vqa_decode_end(AVCodecContext *avctx)
{ {
VqaContext *s = avctx->priv_data; VqaContext *s = avctx->priv_data;
av_free(s->codebook); av_freep(&s->codebook);
av_free(s->next_codebook_buffer); av_freep(&s->next_codebook_buffer);
av_free(s->decode_buffer); av_freep(&s->decode_buffer);
if (s->frame.data[0]) if (s->frame.data[0])
avctx->release_buffer(avctx, &s->frame); avctx->release_buffer(avctx, &s->frame);