[vlc-devel] commit: ts: double free (CID 245) (Derk-Jan Hartman )

[git version control]

vlc | branch: 0.9-bugfix | Derk-Jan Hartman <hartman at videolan.org> | Thu Oct  9 18:00:29 2008 +0200| [3302b09baf18e71f6c4da89b57cb0914477deb10] | committer: Derk-Jan Hartman 

ts: double free (CID 245)
(cherry picked from commit 264444a1699298ecdf4be399563ef5eb478007e0)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3302b09baf18e71f6c4da89b57cb0914477deb10
---

 modules/demux/ts.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index e93ffa9..f22c1bf 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -846,7 +846,6 @@ static void Close( vlc_object_t *p_this )
     if( p_sys->b_udp_out )
     {
         net_Close( p_sys->fd );
-        free( p_sys->buffer );
     }
     vlc_mutex_lock( &p_sys->csa_lock );
     if( p_sys->csa )
@@ -878,10 +877,9 @@ static void Close( vlc_object_t *p_this )
             fclose( p_sys->p_file );
             p_sys->p_file = NULL;
         }
-
-        free( p_sys->buffer );
     }
 
+    free( p_sys->buffer );
     free( p_sys->psz_file );
     p_sys->psz_file = NULL;