diff options
| author | Mike Fulbright <msf@redhat.com> | 2003-08-13 17:03:41 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2003-08-13 17:03:41 +0000 |
| commit | 6e5f5aa8f650c3d98350946d9eed898e96b1272f (patch) | |
| tree | c2806448db546f750d07f87c369db33d7c45707e /loader2 | |
| parent | 18c244128999038f3fab33de4eb1b54e37ecfd4f (diff) | |
| download | anaconda-6e5f5aa8f650c3d98350946d9eed898e96b1272f.tar.gz anaconda-6e5f5aa8f650c3d98350946d9eed898e96b1272f.tar.xz anaconda-6e5f5aa8f650c3d98350946d9eed898e96b1272f.zip | |
fix for bug 101265 - sanitize URL to not have duplicate /
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/urlinstall.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c index f7d07ee41..719b425e6 100644 --- a/loader2/urlinstall.c +++ b/loader2/urlinstall.c @@ -185,7 +185,7 @@ char * mountUrlImage(struct installMethod * method, moduleInfoSet modInfo, moduleList modLoaded, moduleDeps * modDeps, int flags) { int rc; - char * url; + char * url, *p; struct iurlinfo ui; char needsSecondary = ' '; int dir = 1; @@ -302,6 +302,12 @@ char * mountUrlImage(struct installMethod * method, url = malloc(strlen(finalPrefix) + 25 + strlen(ui.address) + strlen(login)); + /* sanitize url so we dont have problems like bug #101265 */ + /* basically avoid duplicate /'s */ + for (p=finalPrefix; *p == '/'; p++); + + finalPrefix = p; + sprintf(url, "%s://%s%s/%s", ui.protocol == URL_METHOD_FTP ? "ftp" : "http", login, ui.address, finalPrefix); |