Browse Source

libschroedingerdec: fix leaking of framewithpts

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 3c0328d58d)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
tags/n3.0.5
Andreas Cadhalpun 9 years ago
parent
commit
4ffd5805af
1 changed files with 9 additions and 7 deletions
  1. +9
    -7
      libavcodec/libschroedingerdec.c

+ 9
- 7
libavcodec/libschroedingerdec.c View File

@@ -218,6 +218,7 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
int outer = 1;
SchroParseUnitContext parse_ctx;
LibSchroFrameContext *framewithpts = NULL;
int ret;

*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);

if (framewithpts && framewithpts->frame && framewithpts->frame->components[0].stride) {
int ret;

if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0)
return ret;
goto end;

memcpy(avframe->data[0],
framewithpts->frame->components[0].data,
@@ -332,15 +332,17 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
avframe->linesize[2] = framewithpts->frame->components[2].stride;

*got_frame = 1;

/* Now free the frame resources. */
libschroedinger_decode_frame_free(framewithpts->frame);
av_free(framewithpts);
} else {
data = NULL;
*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;
}




Loading…
Cancel
Save