[vlc-commits] sout: remove impossible NULL check followed by reverse NULL

Rémi Denis-Courmont git at videolan.org
Sat Nov 15 11:52:57 CET 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 15 12:52:43 2014 +0200| [50428add90c1ae5198b811feb7e26670d5b5709b] | committer: Rémi Denis-Courmont

sout: remove impossible NULL check followed by reverse NULL

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

 src/stream_output/stream_output.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index bbc22bd..06cac75 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -83,9 +83,11 @@ static void mrl_Clean( mrl_t *p_mrl );
 sout_instance_t *sout_NewInstance( vlc_object_t *p_parent, const char *psz_dest )
 {
     sout_instance_t *p_sout;
-
     char *psz_chain;
-    if( psz_dest && psz_dest[0] == '#' )
+
+    assert( psz_dest != NULL );
+
+    if( psz_dest[0] == '#' )
     {
         psz_chain = strdup( &psz_dest[1] );
     }



More information about the vlc-commits mailing list