opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 07:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

libschroedingerdec: fix leaking of framewithpts

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 3c0328d58d98664b05efdd377d3fe66a569d385e)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Andreas Cadhalpun
2016-11-13 23:10:06 +01:00
parent 89a22d3fbf
commit f70e9726dc
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/libschroedingerdec.c
View File

@ -218,6 +218,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
int outer = 1; int outer = 1;
SchroParseUnitContext parse_ctx; SchroParseUnitContext parse_ctx;
LibSchroFrameContext *framewithpts = NULL; LibSchroFrameContext *framewithpts = NULL;
int ret;
*got_frame = 0; *got_frame = 0;
@ -308,10 +309,9 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
framewithpts = ff_schro_queue_pop(&p_schro_params->dec_frame_queue); framewithpts = ff_schro_queue_pop(&p_schro_params->dec_frame_queue);
if (framewithpts && framewithpts->frame && framewithpts->frame->components[0].stride) { if (framewithpts && framewithpts->frame && framewithpts->frame->components[0].stride) {
int ret;
if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0) if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0)
return ret; goto end;
memcpy(avframe->data[0], memcpy(avframe->data[0],
framewithpts->frame->components[0].data, framewithpts->frame->components[0].data,
@ -332,15 +332,17 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
avframe->linesize[2] = framewithpts->frame->components[2].stride; avframe->linesize[2] = framewithpts->frame->components[2].stride;
*got_frame = 1; *got_frame = 1;
/* Now free the frame resources. */
libschroedinger_decode_frame_free(framewithpts->frame);
av_free(framewithpts);
} else { } else {
data = NULL; data = NULL;
*got_frame = 0; *got_frame = 0;
} }
return buf_size; ret = buf_size;
end:
/* Now free the frame resources. */
if (framewithpts && framewithpts->frame)
libschroedinger_decode_frame_free(framewithpts->frame);
av_freep(&framewithpts);
return ret;
} }