har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vqavideo: Cleanup generically on init failure

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-30 19:59:07 +01:00 committed by Andreas Rheinhardt
parent c4c077ada5
commit 5b4aa634f2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vqavideo.c
View File

@ -171,17 +171,17 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
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) if (!s->codebook)
goto fail; return AVERROR(ENOMEM);
s->next_codebook_buffer = av_malloc(s->codebook_size); s->next_codebook_buffer = av_malloc(s->codebook_size);
if (!s->next_codebook_buffer) if (!s->next_codebook_buffer)
goto fail; return AVERROR(ENOMEM);
/* allocate decode buffer */ /* allocate decode buffer */
s->decode_buffer_size = (s->width / s->vector_width) * s->decode_buffer_size = (s->width / s->vector_width) *
(s->height / s->vector_height) * 2; (s->height / s->vector_height) * 2;
s->decode_buffer = av_mallocz(s->decode_buffer_size); s->decode_buffer = av_mallocz(s->decode_buffer_size);
if (!s->decode_buffer) if (!s->decode_buffer)
goto fail; return AVERROR(ENOMEM);
/* initialize the solid-color vectors */ /* initialize the solid-color vectors */
if (s->vector_height == 4) { if (s->vector_height == 4) {
@ -198,11 +198,6 @@ static av_cold int vqa_decode_init(AVCodecContext *avctx)
s->next_codebook_buffer_index = 0; s->next_codebook_buffer_index = 0;
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() \
@ -653,5 +648,5 @@ const AVCodec ff_vqa_decoder = {
.decode = vqa_decode_frame, .decode = vqa_decode_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.defaults = vqa_defaults, .defaults = vqa_defaults,
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
}; };