Re: [FFmpeg-devel] [PATCH] avformat/utils: fix memory leak in avformat_free_context

[Michael Niedermayer]

On Thu, Aug 03, 2017 at 09:29:37AM -0700, Steven Siloti wrote:
> On Mon, Jul 31, 2017 at 11:08 AM, Steven Siloti 
> wrote:
> 
> > The pointer to the packet queue is stored in the internal structure
> > so the queue needs to be flushed before internal is freed.
> >
> > Signed-off-by: Steven Siloti 
> > ---
> >  libavformat/utils.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/libavformat/utils.c b/libavformat/utils.c
> > index 38d247c6cd..58283616dc 100644
> > --- a/libavformat/utils.c
> > +++ b/libavformat/utils.c
> > @@ -4333,8 +4333,8 @@ void avformat_free_context(AVFormatContext *s)
> >  av_dict_free(>metadata);
> >  av_dict_free(>internal->id3v2_meta);
> >  av_freep(>streams);
> > -av_freep(>internal);
> >  flush_packet_queue(s);
> > +av_freep(>internal);
> >  av_free(s);
> >  }
> >
> > --
> > 2.13.0.windows.1
> >
> > Is there something wrong with this patch? It seems like a straightforward
> fix to me. Perhaps you would prefer it as an attachment. If so, attached.

>  utils.c |2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> dcd295b47267244aa767fa9cace848bde36e1043  
> 0001-avformat-utils-fix-memory-leak-in-avformat_free_cont.patch
> From 5ec9a446fdc5874d859f3a9d92a0b5d9f82583aa Mon Sep 17 00:00:00 2001
> From: Steven Siloti 
> Date: Tue, 18 Jul 2017 11:26:39 -0700
> Subject: [PATCH] avformat/utils: fix memory leak in avformat_free_context
> 
> The pointer to the packet queue is stored in the internal structure
> so the queue needs to be flushed before internal is freed.
> 
> Signed-off-by: Steven Siloti 
> ---
>  libavformat/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

applied

thx

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No human being will ever know the Truth, for even if they happen to say it
by chance, they would not even known they had done so. -- Xenophanes


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avformat/utils: fix memory leak in avformat_free_context

[Steven Siloti]

On Mon, Jul 31, 2017 at 11:08 AM, Steven Siloti 
wrote:

> The pointer to the packet queue is stored in the internal structure
> so the queue needs to be flushed before internal is freed.
>
> Signed-off-by: Steven Siloti 
> ---
>  libavformat/utils.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/utils.c b/libavformat/utils.c
> index 38d247c6cd..58283616dc 100644
> --- a/libavformat/utils.c
> +++ b/libavformat/utils.c
> @@ -4333,8 +4333,8 @@ void avformat_free_context(AVFormatContext *s)
>  av_dict_free(>metadata);
>  av_dict_free(>internal->id3v2_meta);
>  av_freep(>streams);
> -av_freep(>internal);
>  flush_packet_queue(s);
> +av_freep(>internal);
>  av_free(s);
>  }
>
> --
> 2.13.0.windows.1
>
> Is there something wrong with this patch? It seems like a straightforward
fix to me. Perhaps you would prefer it as an attachment. If so, attached.


0001-avformat-utils-fix-memory-leak-in-avformat_free_cont.patch
Description: Binary data
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avformat/utils: fix memory leak in avformat_free_context

[Steven Siloti]

The pointer to the packet queue is stored in the internal structure
so the queue needs to be flushed before internal is freed.

Signed-off-by: Steven Siloti 
---
 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 38d247c6cd..58283616dc 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4333,8 +4333,8 @@ void avformat_free_context(AVFormatContext *s)
 av_dict_free(>metadata);
 av_dict_free(>internal->id3v2_meta);
 av_freep(>streams);
-av_freep(>internal);
 flush_packet_queue(s);
+av_freep(>internal);
 av_free(s);
 }
 
-- 
2.13.0.windows.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel