fix

diff --git a/ChangeLog b/ChangeLog
index 8d8e1f589750e69b87b174c8bcaa9944ffe36028..4bc79dc958968ad7612a843ad737a69eb36b3105 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-05  Miklos Szeredi <miklos@szeredi.hu>
+
+       * fusermount: don't allow empty mountpoint argument, which defeats
+       automatic umounting in fuse_main().  Bugreport by Václav Jůza
+
 2005-08-03  Miklos Szeredi <miklos@szeredi.hu>
 
        * fix warnings in fuse.h and fuse_lowlevel.h if -Wshadow compiler

diff --git a/util/fusermount.c b/util/fusermount.c
index 21504d4bd1da4e0227d1854d3a803bb77425899f..03760dd46581be05546994e4b8f670bc40c80d7c 100644 (file)
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -905,6 +905,11 @@ static char *resolve_path(const char *orig)
     char *lastcomp;
     const char *toresolv;
 
+    if (!orig[0]) {
+        fprintf(stderr, "%s: invalid mountpoint '%s'\n", progname, orig);
+        return NULL;
+    }
+
     copy = strdup(orig);
     if (copy == NULL) {
         fprintf(stderr, "%s: failed to allocate memory\n", progname);