[vlc-devel] commit: Don't leak an object in case of an error. ( Rémi Duraffort )

git version control git at videolan.org
Sat Jun 28 23:01:37 CEST 2008


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Sat Jun 28 23:03:03 2008 +0200| [67a55f9c6be8d6cb905a201ffe8d40f89032d7af]

Don't leak an object in case of an error.

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

 src/input/decoder.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 45e2e78..b0ccbe8 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -463,7 +463,10 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
     /* Allocate our private structure for the decoder */
     p_dec->p_owner = p_owner = malloc( sizeof( decoder_owner_sys_t ) );
     if( p_dec->p_owner == NULL )
+    {
+        vlc_object_release( p_dec );
         return NULL;
+    }
     p_dec->p_owner->b_own_thread = true;
     p_dec->p_owner->i_preroll_end = -1;
     p_dec->p_owner->p_input = p_input;
@@ -478,7 +481,11 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
 
     /* decoder fifo */
     if( ( p_dec->p_owner->p_fifo = block_FifoNew() ) == NULL )
+    {
+        free( p_dec->p_owner );
+        vlc_object_release( p_dec );
         return NULL;
+    }
 
     /* Set buffers allocation callbacks for the decoders */
     p_dec->pf_aout_buffer_new = aout_new_buffer;




More information about the vlc-devel mailing list