diff mbox series

[FFmpeg-devel,3/3] libavformat/lafdec: free data

Message ID 20230130234527.13149-3-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/3] tools/target_dec_fuzzer: Adjust threshold for BONK | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Michael Niedermayer Jan. 30, 2023, 11:45 p.m. UTC
Fixes: memleak

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/lafdec.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Andreas Rheinhardt Jan. 31, 2023, 11:25 a.m. UTC | #1
Michael Niedermayer:
> Fixes: memleak
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/lafdec.c | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c
> index b78ec3649c..f6d2d5f235 100644
> --- a/libavformat/lafdec.c
> +++ b/libavformat/lafdec.c
> @@ -253,6 +253,15 @@ again:
>      return 0;
>  }
>  
> +static int laf_read_close(AVFormatContext *ctx)
> +{
> +    LAFContext *s = ctx->priv_data;
> +
> +    av_freep(&s->data);
> +
> +    return 0;
> +}
> +
>  static int laf_read_seek(AVFormatContext *ctx, int stream_index,
>                           int64_t timestamp, int flags)
>  {
> @@ -270,6 +279,7 @@ const AVInputFormat ff_laf_demuxer = {
>      .read_probe     = laf_probe,
>      .read_header    = laf_read_header,
>      .read_packet    = laf_read_packet,
> +    .read_close     = laf_read_close,
>      .read_seek      = laf_read_seek,
>      .extensions     = "laf",
>      .flags          = AVFMT_GENERIC_INDEX,

Needs the FF_FMT_INIT_CLEANUP flag, too (otherwise it will leak in case
of avformat_new_stream() failure).

- Andreas
Michael Niedermayer Jan. 31, 2023, 8:43 p.m. UTC | #2
On Tue, Jan 31, 2023 at 12:25:25PM +0100, Andreas Rheinhardt wrote:
> Michael Niedermayer:
> > Fixes: memleak
> > 
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavformat/lafdec.c | 10 ++++++++++
> >  1 file changed, 10 insertions(+)
> > 
> > diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c
> > index b78ec3649c..f6d2d5f235 100644
> > --- a/libavformat/lafdec.c
> > +++ b/libavformat/lafdec.c
> > @@ -253,6 +253,15 @@ again:
> >      return 0;
> >  }
> >  
> > +static int laf_read_close(AVFormatContext *ctx)
> > +{
> > +    LAFContext *s = ctx->priv_data;
> > +
> > +    av_freep(&s->data);
> > +
> > +    return 0;
> > +}
> > +
> >  static int laf_read_seek(AVFormatContext *ctx, int stream_index,
> >                           int64_t timestamp, int flags)
> >  {
> > @@ -270,6 +279,7 @@ const AVInputFormat ff_laf_demuxer = {
> >      .read_probe     = laf_probe,
> >      .read_header    = laf_read_header,
> >      .read_packet    = laf_read_packet,
> > +    .read_close     = laf_read_close,
> >      .read_seek      = laf_read_seek,
> >      .extensions     = "laf",
> >      .flags          = AVFMT_GENERIC_INDEX,
> 
> Needs the FF_FMT_INIT_CLEANUP flag, too (otherwise it will leak in case
> of avformat_new_stream() failure).

ok, will apply with this

thx
diff mbox series

Patch

diff --git a/libavformat/lafdec.c b/libavformat/lafdec.c
index b78ec3649c..f6d2d5f235 100644
--- a/libavformat/lafdec.c
+++ b/libavformat/lafdec.c
@@ -253,6 +253,15 @@  again:
     return 0;
 }
 
+static int laf_read_close(AVFormatContext *ctx)
+{
+    LAFContext *s = ctx->priv_data;
+
+    av_freep(&s->data);
+
+    return 0;
+}
+
 static int laf_read_seek(AVFormatContext *ctx, int stream_index,
                          int64_t timestamp, int flags)
 {
@@ -270,6 +279,7 @@  const AVInputFormat ff_laf_demuxer = {
     .read_probe     = laf_probe,
     .read_header    = laf_read_header,
     .read_packet    = laf_read_packet,
+    .read_close     = laf_read_close,
     .read_seek      = laf_read_seek,
     .extensions     = "laf",
     .flags          = AVFMT_GENERIC_INDEX,