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

avcodec/mss4: Fix memleaks upon allocation error

Browse Source 
During init the mts2 decoder allocates several VLCs and then several
buffers in a loop; if one of the latter allocations fails, only the VLCs
are freed, not any buffers that might already have been successfully
allocated. This commit fixes this by setting the
FF_CODEC_CAP_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-11-03 23:43:01 +01:00
parent a125e08130
commit 4b4c7d6e1a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mss4.c
View File

@ -648,7 +648,6 @@ static av_cold int mss4_decode_init(AVCodecContext *avctx)
if (mss4_init_vlcs(c)) { if (mss4_init_vlcs(c)) {
av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n"); av_log(avctx, AV_LOG_ERROR, "Cannot initialise VLCs\n");
mss4_free_vlcs(c);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -656,16 +655,13 @@ static av_cold int mss4_decode_init(AVCodecContext *avctx)
c->prev_dc[i] = av_malloc_array(c->dc_stride[i], sizeof(**c->prev_dc)); c->prev_dc[i] = av_malloc_array(c->dc_stride[i], sizeof(**c->prev_dc));
if (!c->prev_dc[i]) { if (!c->prev_dc[i]) {
av_log(avctx, AV_LOG_ERROR, "Cannot allocate buffer\n"); av_log(avctx, AV_LOG_ERROR, "Cannot allocate buffer\n");
mss4_free_vlcs(c);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
} }
c->pic = av_frame_alloc(); c->pic = av_frame_alloc();
if (!c->pic) { if (!c->pic)
mss4_decode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
avctx->pix_fmt = AV_PIX_FMT_YUV444P; avctx->pix_fmt = AV_PIX_FMT_YUV444P;
@ -682,4 +678,5 @@ AVCodec ff_mts2_decoder = {
.close = mss4_decode_end, .close = mss4_decode_end,
.decode = mss4_decode_frame, .decode = mss4_decode_frame,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
}; };