Fix 'zfs set volsize=N pool/dataset'

[zfs.git] / cmd / mount_zfs / mount_zfs.c

diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
index 204f9fa..c38ba51 100644 (file)
--- a/cmd/mount_zfs/mount_zfs.c
+++ b/cmd/mount_zfs/mount_zfs.c
@@ -120,6 +120,7 @@ parse_option(char *mntopt, unsigned long *mntflags,
                if (*ptr == '=') {
                        *ptr = '\0';
                        value = ptr+1;
+                       VERIFY3P(value, !=, NULL);
                        break;
                }
        }
@@ -228,7 +229,9 @@ parse_dataset(char *dataset)
        char cwd[PATH_MAX];
        int len;
 
-       (void) getcwd(cwd, PATH_MAX);
+       if (getcwd(cwd, PATH_MAX) == NULL)
+               return (dataset);
+
        len = strlen(cwd);
 
        /* Do not add one when cwd already ends in a trailing '/' */