[vlc-devel] commit: Fix NULL dereferencing : CID 24 ( Rafaël Carré )

[git version control]

vlc | branch: 0.8.6-bugfix | Rafaël Carré <funman at videolan.org> | Tue Jun  3 14:47:10 2008 +0200| [65d675660eeab5d65c2c29a430d84f35f122ece9]

Fix NULL dereferencing : CID 24

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

 modules/stream_out/transcode.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/stream_out/transcode.c b/modules/stream_out/transcode.c
index b988339..4fdbd0c 100644
--- a/modules/stream_out/transcode.c
+++ b/modules/stream_out/transcode.c
@@ -2780,15 +2780,15 @@ static int transcode_osd_new( sout_stream_t *p_stream, sout_stream_id_t *id )
 
  error:
     msg_Err( p_stream, "starting osd encoding thread failed" );
-    if( id->p_encoder->p_module )
-            module_Unneed( id->p_encoder, id->p_encoder->p_module );
     if( id->p_encoder )
     {
+        if( id->p_encoder->p_module )
+            module_Unneed( id->p_encoder, id->p_encoder->p_module );
         vlc_object_detach( id->p_encoder );
         vlc_object_destroy( id->p_encoder );
     }
-    if( fmt.psz_language ) free( fmt.psz_language );
-    if( id ) free( id );
+    free( fmt.psz_language );
+    free( id );
     p_sys->id_osd = NULL;
     p_sys->b_es_osd = VLC_FALSE;
     return VLC_EGENERIC;