Attachment 158212 Details for Bug 245936 – don't free the string before printing it

[patch] don't free the string before printing it

245936.diff (text/plain), 1.40 KB, created by Chris Lumens on 2007-06-29 14:41:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lumens

Created: 2007-06-29 14:41:02 UTC

Size: 1.40 KB

patch

obsolete

>? .ChangeLog.swp
>? loader2/.kickstart.c.swp
>Index: loader2/kickstart.c
>===================================================================
>RCS file: /usr/local/CVS/anaconda/loader2/kickstart.c,v
>retrieving revision 1.37
>diff -u -r1.37 kickstart.c
>--- loader2/kickstart.c	30 Apr 2007 16:50:27 -0000	1.37
>+++ loader2/kickstart.c	29 Jun 2007 14:31:31 -0000
>@@ -351,7 +351,7 @@
>     getHostPathandLogin (ksSource, host, file, &login, &password, ip);
> }
> 
>-static char *newKickstartLocation(char *origLocation) {
>+static char *newKickstartLocation(const char *origLocation) {
>     const char *location;
>     char *retval = NULL;
>     newtComponent f, okay, cancel, answer, locationEntry;
>@@ -430,13 +430,21 @@
>         }
> 
>         if (rc != 0) {
>-            if (loaderData->ksFile != NULL)
>-                free(loaderData->ksFile);
>+            char *newLocation;
> 
>-            loaderData->ksFile = newKickstartLocation(c);
>+            if (!strcmp(c, "ks"))
>+                newLocation = newKickstartLocation("");
>+            else
>+                newLocation = newKickstartLocation(c);
> 
>             if (loaderData->ksFile != NULL)
>+                free(loaderData->ksFile);
>+
>+            if (newLocation != NULL) {
>+               loaderData->ksFile = strdup(newLocation);
>+               free(newLocation);
>                return getKickstartFile(loaderData);
>+            }
>             else
>                return;
>         }

Actions: View | Diff

Attachments on bug 245936: 158212