From: Rémi Denis-Courmont <remi@remlab.net>
Date: Mon, 2 Aug 2010 18:42:22 +0000 (+0300)
Subject: FTP: fix relative file paths (fix #3984)
X-Git-Tag: 1.2.0-pre1~5580
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0ad85b8520873e54cd1e11c3494f0ec621497404;p=vlc

FTP: fix relative file paths (fix #3984)
---

diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index ca50e0cc1d..127ee35729 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -303,11 +303,16 @@ static int parseURL( vlc_url_t *url, const char *path )
     if( url->i_port <= 0 )
         url->i_port = IPPORT_FTP; /* default port */
 
+    if( url->psz_path == NULL )
+        return VLC_SUCCESS;
     /* FTP URLs are relative to user's default directory (RFC1738 §3.2)
     For absolute path use ftp://foo.bar//usr/local/etc/filename */
     /* FIXME: we should issue a series of CWD, one per slash */
-    if( url->psz_path == NULL )
-        return VLC_SUCCESS;
+    if( url->psz_path )
+    {
+        assert( url->psz_path[0] == '/' );
+        url->psz_path++;
+    }
 
     char *type = strstr( url->psz_path, ";type=" );
     if( type )