[FFmpeg-devel] [PATCH 2/2] avformat/oggdec: Fix metadata memleak on multiple headers

[Matthew Wolenetz]

Friendly ping. I'd like to not have to land this in Chromium before upstream
 ffmpeg, but I may need to soon.

On Tue, Mar 6, 2018 at 1:56 PM, Michael Niedermayer <michael at niedermayer.cc>
wrote:

> Fixes: Chromium bug 800123
> Reported-by: Matt Wolenetz <wolenetz at google.com>
> Reviewed-by: Matt Wolenetz <wolenetz at google.com>
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
>  libavformat/oggdec.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
> index 38f60653f9..27d16a3e4e 100644
> --- a/libavformat/oggdec.c
> +++ b/libavformat/oggdec.c
> @@ -128,7 +128,10 @@ static int ogg_restore(AVFormatContext *s)
>      ogg->state = ost->next;
>
>          for (i = 0; i < ogg->nstreams; i++) {
> -            av_freep(&ogg->streams[i].buf);
> +            struct ogg_stream *stream = &ogg->streams[i];
> +            av_freep(&stream->buf);
> +            av_freep(&stream->new_metadata);
> +
>              if (i >= ost->nstreams || !ost->streams[i].private) {
>                  free_stream(s, i);
>              }
> --
> 2.16.2
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>