Changeset 44dd0b86e9b68f4f00511e943afd37e589bd38a3

Timestamp:

27/12/07 15:31:43 (1 year ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1198765903 +0000

git-parent:

[fff37839759c1d6b7838838f923d49ee1bcb3bf1]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1198765903 +0000

Message:

Fix segfault when Connect() returned failure and fix memleaks. Make sure live555 modules exits while in Connect() if vlc is asked to stop.

Files:

• modules/demux/live555.cpp (modified) (7 diffs)

modules/demux/live555.cpp

@@ -476 +476 @@
-
-createnew:
+    if( p_demux->b_die || p_demux->b_error )
+    {
+        free( psz_user );
+        free( psz_pwd );
+        free( psz_url );
+        return VLC_EGENERIC;
+    }
+
-    if( var_CreateGetBool( p_demux, "rtsp-http" ) )
-        i_http_port = var_CreateGetInteger( p_demux, "rtsp-http-port" );
@@ -485 +493 @@
-        msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
-                 p_sys->env->getResultMsg() );
+        free( psz_user );
+        free( psz_pwd );
+        free( psz_url );
-        return VLC_EGENERIC;
-    }
@@ -511 +522 @@
-
-    p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator,
-Create
+
-    if( p_sdp == NULL )
-    {
@@ -518 +529 @@
-        const char *psz_error = p_sys->env->getResultMsg();
-
-
-
+
-            sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s",
-                    &i_code );
-        else sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code );
+        msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error );
-
-        if( i_code == 401 )
@@ -543 +554 @@
-            }
-        }
-
+(i_code != 0) && 
-        {
-            /* Perhaps a firewall is being annoying. Try HTTP tunneling mode */
@@ -551 +562 @@
-            var_Set( p_demux, "rtsp-http", val );
-            if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
+            p_sys->rtsp = NULL;
-            goto createnew;
-        }
@@ -557 +569 @@
-            msg_Dbg( p_demux, "connection timeout, retrying" );
-            if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
+            p_sys->rtsp = NULL;
-            goto createnew;
-        }
-        i_ret = VLC_EGENERIC;
-    }
+
+    /* malloc-ated copy */
-    if( psz_url ) free( psz_url );
-
-    /* malloc-ated copy */
-    if( psz_user ) free( psz_user );
-    if( psz_pwd ) free( psz_pwd );