X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=cmd%2Fmount_zfs%2Fmount_zfs.c;h=c38ba51c3e84cdcd8f96c4c36af93d5a591391d7;hb=1dc3fea59e8fbcf81515a3bc616566e880181161;hp=204f9fa14679a7818586b4139c1ad482fd30e517;hpb=3aff775555a40fe3e5193f1309ba6e80312be5ff;p=zfs.git

diff --git a/cmd/mount_zfs/mount_zfs.c b/cmd/mount_zfs/mount_zfs.c
index 204f9fa..c38ba51 100644
--- 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 '/' */