Fix traceback when trying to add a leading slash to paths without one

(#197403, #201243, #201367).

2 files changed, 8 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index a6ba0240c..9515d28de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-04  Chris Lumens  <clumens@redhat.com>
+
+	* loader2/urls.c (urlMainSetupPanel):  Fix traceback when trying to
+	add a leading slash to paths without one (#197403, #201243, #201367).
+
 2006-08-03  Peter Jones  <pjones@redhat.com>
 
 	* gui.py (ProgressWindow): Make a timeout after which we update the 
diff --git a/loader2/urls.c b/loader2/urls.c
index c7475db9d..21be24063 100644
--- a/loader2/urls.c
+++ b/loader2/urls.c
@@ -384,17 +384,10 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol,
     if (ui->prefix) free(ui->prefix);
 
     /* add a slash at the start of the dir if it is missing */
-    if (*dir != '/') {
-        if ((buf = realloc(buf, strlen(dir) + 2)) == NULL) {
-            buf = strdup(dir);        /* try dir anyway */
-        } else {
-            sprintf(buf, "/%s", dir);
-        }
-        ui->prefix = strdup(buf);
-        free(buf);
-    } else {
+    if (*dir != '/')
+        asprintf(&(ui->prefix), "/%s", dir);
+    else
         ui->prefix = strdup(dir);
-    }
 
     /* Get rid of trailing /'s */
     chptr = ui->prefix + strlen(ui->prefix) - 1;