diff mbox series

[FFmpeg-devel,7/7] avformat/flvdec: Free metaVideoColor

Message ID 20240912233337.2444412-7-michael@niedermayer.cc
State New
Headers show
Series [FFmpeg-devel,1/7] avformat/mov_chan: Check for FF_SANE_NB_CHANNELS | 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 Sept. 12, 2024, 11:33 p.m. UTC
Fixes: memeleak
Fixes: 70659/clusterfuzz-testcase-minimized-ffmpeg_dem_KUX_fuzzer-4539872627458048

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

Comments

Steven Liu Sept. 13, 2024, 2:15 a.m. UTC | #1
Michael Niedermayer <michael@niedermayer.cc> 于2024年9月13日周五 07:44写道:
>
> Fixes: memeleak
> Fixes: 70659/clusterfuzz-testcase-minimized-ffmpeg_dem_KUX_fuzzer-4539872627458048
>
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavformat/flvdec.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
> index 22a9b9e4a7c..1fb3e0cd3fa 100644
> --- a/libavformat/flvdec.c
> +++ b/libavformat/flvdec.c
> @@ -1111,6 +1111,7 @@ static int flv_parse_video_color_info(AVFormatContext *s, AVStream *st, int64_t
>          return TYPE_UNKNOWN;
>      }
>
> +    av_free(flv->metaVideoColor);
>      if (!(flv->metaVideoColor = av_mallocz(sizeof(FLVMetaVideoColor)))) {
>          return AVERROR(ENOMEM);
>      }
> --
> 2.46.0
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

lgtm


Thanks
Steven
Michael Niedermayer Sept. 18, 2024, 10:20 p.m. UTC | #2
On Fri, Sep 13, 2024 at 10:15:28AM +0800, Steven Liu wrote:
> Michael Niedermayer <michael@niedermayer.cc> 于2024年9月13日周五 07:44写道:
> >
> > Fixes: memeleak
> > Fixes: 70659/clusterfuzz-testcase-minimized-ffmpeg_dem_KUX_fuzzer-4539872627458048
> >
> > Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavformat/flvdec.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
> > index 22a9b9e4a7c..1fb3e0cd3fa 100644
> > --- a/libavformat/flvdec.c
> > +++ b/libavformat/flvdec.c
> > @@ -1111,6 +1111,7 @@ static int flv_parse_video_color_info(AVFormatContext *s, AVStream *st, int64_t
> >          return TYPE_UNKNOWN;
> >      }
> >
> > +    av_free(flv->metaVideoColor);
> >      if (!(flv->metaVideoColor = av_mallocz(sizeof(FLVMetaVideoColor)))) {
> >          return AVERROR(ENOMEM);
> >      }
> > --
> > 2.46.0
> >
> > _______________________________________________
> > ffmpeg-devel mailing list
> > ffmpeg-devel@ffmpeg.org
> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> >
> > To unsubscribe, visit link above, or email
> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> 
> lgtm

will apply

thx

[...]
diff mbox series

Patch

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 22a9b9e4a7c..1fb3e0cd3fa 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -1111,6 +1111,7 @@  static int flv_parse_video_color_info(AVFormatContext *s, AVStream *st, int64_t
         return TYPE_UNKNOWN;
     }
 
+    av_free(flv->metaVideoColor);
     if (!(flv->metaVideoColor = av_mallocz(sizeof(FLVMetaVideoColor)))) {
         return AVERROR(ENOMEM);
     }