[vlc-devel] commit: Handle return value and fix memleaks. (Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Tue Aug 12 11:51:12 2008 +0800| [f1558cbbe8321934cb368be637dbd21e1697804e] | committer: Jean-Paul Saman 

Handle return value and fix memleaks.

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

 modules/demux/demuxdump.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/demux/demuxdump.c b/modules/demux/demuxdump.c
index 5f2a5f0..2960807 100644
--- a/modules/demux/demuxdump.c
+++ b/modules/demux/demuxdump.c
@@ -101,6 +101,10 @@ static int Open( vlc_object_t * p_this )
     if( !p_demux->b_force )
         return VLC_EGENERIC;
 
+    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( !p_sys )
+        return VLC_ENOMEM;
+
     var_Create( p_demux, "demuxdump-append", VLC_VAR_BOOL|VLC_VAR_DOINHERIT );
     var_Get( p_demux, "demuxdump-append", &val );
     b_append = val.b_bool;
@@ -111,13 +115,15 @@ static int Open( vlc_object_t * p_this )
 
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
-    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+
     p_sys->i_write = 0;
     p_sys->p_file = NULL;
     p_sys->psz_file = var_CreateGetString( p_demux, "demuxdump-file" );
     if( *p_sys->psz_file == '\0' )
     {
         msg_Warn( p_demux, "no dump file name given" );
+        free( p_sys->psz_file );
+        free( p_sys );
         return VLC_EGENERIC;
     }
 
@@ -129,7 +135,7 @@ static int Open( vlc_object_t * p_this )
     else if( ( p_sys->p_file = utf8_fopen( p_sys->psz_file, psz_mode ) ) == NULL )
     {
         msg_Err( p_demux, "cannot create `%s' for writing", p_sys->psz_file );
-
+        free( p_sys->psz_file );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -156,7 +162,6 @@ static void Close( vlc_object_t *p_this )
         fclose( p_sys->p_file );
     }
     free( p_sys->psz_file );
-
     free( p_sys );
 }