From 6e5f5aa8f650c3d98350946d9eed898e96b1272f Mon Sep 17 00:00:00 2001
From: Mike Fulbright <msf@redhat.com>
Date: Wed, 13 Aug 2003 17:03:41 +0000
Subject: fix for bug 101265 - sanitize URL to not have duplicate /

---
 loader2/urlinstall.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'loader2')

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);
-- 
cgit