]> git.sesse.net Git - vlc/commitdiff
Don't leak an object in case of an error.
authorRémi Duraffort <ivoire@videolan.org>
Sat, 28 Jun 2008 21:03:03 +0000 (23:03 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Sat, 28 Jun 2008 21:03:03 +0000 (23:03 +0200)
src/input/decoder.c

index 45e2e784f4c6394a56437c290a754887b4b40ce3..b0ccbe8f228ad2e1df0bcf5534d9c461ac06ffb4 100644 (file)
@@ -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;