summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Kraai2001-04-17 04:22:22 +0000
committerMatt Kraai2001-04-17 04:22:22 +0000
commit3d406da0c90e319d0e05f75e2dcd485d5954fc1d (patch)
treec18b4d25f0ff05183b99e3723b53e2b8987bf54e
parent1c0d311ff437823ee99019881d4fe4109def1a8c (diff)
downloadbusybox-3d406da0c90e319d0e05f75e2dcd485d5954fc1d.zip
busybox-3d406da0c90e319d0e05f75e2dcd485d5954fc1d.tar.gz
Fix segfault on `mount -t nfs' reported by Gratien D'haese.
-rw-r--r--mount.c3
-rw-r--r--util-linux/mount.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/mount.c b/mount.c
index 5b6ec1e..d1568d8 100644
--- a/mount.c
+++ b/mount.c
@@ -405,6 +405,9 @@ extern int mount_main(int argc, char **argv)
argv++;
}
+ if (device == NULL && directory == NULL)
+ goto goodbye;
+
if (all == TRUE || directory == NULL) {
struct mntent *m;
FILE *f = setmntent("/etc/fstab", "r");
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 5b6ec1e..d1568d8 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -405,6 +405,9 @@ extern int mount_main(int argc, char **argv)
argv++;
}
+ if (device == NULL && directory == NULL)
+ goto goodbye;
+
if (all == TRUE || directory == NULL) {
struct mntent *m;
FILE *f = setmntent("/etc/fstab", "r");