diff options
| author | Radek Vykydal <rvykydal@redhat.com> | 2009-09-29 13:22:21 +0200 |
|---|---|---|
| committer | Radek Vykydal <rvykydal@redhat.com> | 2009-10-12 14:56:24 +0200 |
| commit | 6e028d7c68c240289cf8de07b635c25a017c917f (patch) | |
| tree | 036dd108f8762a6e1119c76a78b67380b4a74a03 | |
| parent | 3f9accd3f4bbe345e95b84363381e2d8b4534831 (diff) | |
| download | anaconda-6e028d7c68c240289cf8de07b635c25a017c917f.tar.gz anaconda-6e028d7c68c240289cf8de07b635c25a017c917f.tar.xz anaconda-6e028d7c68c240289cf8de07b635c25a017c917f.zip | |
Fix a segfault when stage2= boot parameter and kickstart url method is used (#524417).
Concerns cases when stage2= can't be parsed as http or ftp url.
| -rw-r--r-- | loader/urlinstall.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/loader/urlinstall.c b/loader/urlinstall.c index 150800e48..57b9bc21a 100644 --- a/loader/urlinstall.c +++ b/loader/urlinstall.c @@ -463,9 +463,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc, } /* determine install type */ - if (strstr(url, "http://") || strstr(url, "ftp://")) - loaderData->method = METHOD_URL; - else { + if (!strstr(url, "http://") && !strstr(url, "ftp://")) { newtWinMessage(_("Kickstart Error"), _("OK"), _("Unknown Url method %s"), url); return; @@ -479,6 +477,7 @@ void setKickstartUrl(struct loaderData_s * loaderData, int argc, return; ((struct urlInstallData *)loaderData->stage2Data)->url = url; + loaderData->method = METHOD_URL; } logMessage(INFO, "results of url ks, url %s", url); |