diff mbox series

[FFmpeg-devel] avcodec/cbs_av1: Free content in cbs_av1_free_metadata()

Message ID 20201011134657.4903-1-michael@niedermayer.cc
State Accepted
Commit d40f2498618515c9e3d81db295c881b800666dc2
Headers show
Series [FFmpeg-devel] avcodec/cbs_av1: Free content in cbs_av1_free_metadata() | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make warning Make failed

Commit Message

Michael Niedermayer Oct. 11, 2020, 1:46 p.m. UTC
Fixes: memleak
Fixes: 25838/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5736255957237760

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/cbs_av1.c | 1 +
 1 file changed, 1 insertion(+)

Comments

James Almer Oct. 11, 2020, 1:58 p.m. UTC | #1
On 10/11/2020 10:46 AM, Michael Niedermayer wrote:
> Fixes: memleak
> Fixes: 25838/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5736255957237760
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/cbs_av1.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
> index 65cf45fcfa..8aa7b09fa7 100644
> --- a/libavcodec/cbs_av1.c
> +++ b/libavcodec/cbs_av1.c
> @@ -1228,6 +1228,7 @@ static void cbs_av1_free_metadata(void *unit, uint8_t *content)
>          av_buffer_unref(&md->metadata.itut_t35.payload_ref);
>          break;
>      }
> +    av_free(content);

nit: av_freep() to be consistent with how cbs_h2645 handles this.

LGTM either way.

>  }
>  
>  static const CodedBitstreamUnitTypeDescriptor cbs_av1_unit_types[] = {
>
Michael Niedermayer Oct. 11, 2020, 6:21 p.m. UTC | #2
On Sun, Oct 11, 2020 at 10:58:04AM -0300, James Almer wrote:
> On 10/11/2020 10:46 AM, Michael Niedermayer wrote:
> > Fixes: memleak
> > Fixes: 25838/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5736255957237760
> > 
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/cbs_av1.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
> > index 65cf45fcfa..8aa7b09fa7 100644
> > --- a/libavcodec/cbs_av1.c
> > +++ b/libavcodec/cbs_av1.c
> > @@ -1228,6 +1228,7 @@ static void cbs_av1_free_metadata(void *unit, uint8_t *content)
> >          av_buffer_unref(&md->metadata.itut_t35.payload_ref);
> >          break;
> >      }
> > +    av_free(content);
> 
> nit: av_freep() to be consistent with how cbs_h2645 handles this.

av_freep() does a dead assignment, this could trigger warnings maybe


> 
> LGTM either way.

will apply later

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index 65cf45fcfa..8aa7b09fa7 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -1228,6 +1228,7 @@  static void cbs_av1_free_metadata(void *unit, uint8_t *content)
         av_buffer_unref(&md->metadata.itut_t35.payload_ref);
         break;
     }
+    av_free(content);
 }
 
 static const CodedBitstreamUnitTypeDescriptor cbs_av1_unit_types[] = {