[vlc-devel] commit: FIx a segfault: we need both user and password to be not NULL. ( Rémi Duraffort )

git version control git at videolan.org
Mon Jun 22 07:55:07 CEST 2009


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Jun 22 07:47:22 2009 +0200| [c90fc1d049a23032ab204e74b6f810660a6d9e43] | committer: Rémi Duraffort 

FIx a segfault: we need both user and password to be not NULL.

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

 modules/demux/live555.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 9287f83..cedc42d 100644
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -489,7 +489,7 @@ static int Connect( demux_t *p_demux )
     int  i_ret        = VLC_SUCCESS;
 
     if( p_sys->url.i_port == 0 ) p_sys->url.i_port = 554;
-    if( p_sys->url.psz_username || p_sys->url.psz_password )
+    if( p_sys->url.psz_username && p_sys->url.psz_password )
     {
         int err;
         err = asprintf( &psz_url, "rtsp://%s:%d%s", p_sys->url.psz_host,




More information about the vlc-devel mailing list