[FFmpeg-devel] [PATCH 2/2] libschroedingerdec: fix leaking of framewithpts

[Michael Niedermayer]

On Sun, Nov 13, 2016 at 11:25:32PM +0100, Andreas Cadhalpun wrote:
> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> ---
>  libavcodec/libschroedingerdec.c | 26 +++++++++++++++++---------
>  1 file changed, 17 insertions(+), 9 deletions(-)
> 
> diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c
> index 1e392b3..83c790c 100644
> --- a/libavcodec/libschroedingerdec.c
> +++ b/libavcodec/libschroedingerdec.c
> @@ -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;
>  
> @@ -236,7 +237,8 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
>              enc_buf->tag = schro_tag_new(av_malloc(sizeof(int64_t)), av_free);
>              if (!enc_buf->tag->value) {
>                  av_log(avctx, AV_LOG_ERROR, "Unable to allocate SchroTag\n");
> -                return AVERROR(ENOMEM);
> +                ret = AVERROR(ENOMEM);
> +                goto end;
>              }
>              AV_WN(64, enc_buf->tag->value, pts);
>              /* Push buffer into decoder. */
> @@ -267,8 +269,10 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx,
>                  /* Decoder needs a frame - create one and push it in. */
>                  frame = ff_create_schro_frame(avctx,
>                                                p_schro_params->frame_format);
> -                if (!frame)
> -                    return AVERROR(ENOMEM);
> +                if (!frame) {
> +                    ret = AVERROR(ENOMEM);
> +                    goto end;
> +                }
>                  schro_decoder_add_output_picture(decoder, frame);
>                  break;
>  

this looks a bit strange
framewithpts is set to newly allocated memory below which is injected
into the que and IIUC that can occur multiple times
the free at the end for one of multiple such que entries feels wrong

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is what and why we do it that matters, not just one of them.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20161115/ebe6b17f/attachment.sig>