summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-09-16 14:52:35 +0000
committerJeremy Katz <katzj@redhat.com>2005-09-16 14:52:35 +0000
commit8020464444a93de930f7554c7da00a5a574cab77 (patch)
tree83a7ee4defa6a4cfac324724a2bbe9eb2995a9be
parente7229a9fd5e39046a70141a56decd33ee31608d9 (diff)
downloadanaconda-8020464444a93de930f7554c7da00a5a574cab77.tar.gz
anaconda-8020464444a93de930f7554c7da00a5a574cab77.tar.xz
anaconda-8020464444a93de930f7554c7da00a5a574cab77.zip
2005-09-16 Jeremy Katz <katzj@redhat.com>
* isys/imount.c (doPwMount): Fix segfault when NFS mounting with no options.
-rw-r--r--ChangeLog5
-rw-r--r--isys/imount.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 42971231b..c0890c45d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-16 Jeremy Katz <katzj@redhat.com>
+
+ * isys/imount.c (doPwMount): Fix segfault when NFS mounting with
+ no options.
+
2005-09-15 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/isys/imount.c b/isys/imount.c
index e615f70f4..00c92d278 100644
--- a/isys/imount.c
+++ b/isys/imount.c
@@ -44,9 +44,12 @@ int doPwMount(char * dev, char * where, char * fs, int options, void *data) {
strcat(buf, dev);
} else {
#ifndef DISABLE_NETWORK
- char * extra_opts = strdup(data);
+ char * extra_opts = NULL;
int flags = 0;
+ if (data)
+ strdup(data);
+
buf = dev;
/*logMessage("calling nfsmount(%s, %s, &flags, &extra_opts, &mount_opt)",
buf, where);*/