From 5b8cbb8e38f948539d47f11d870efecefc5df9c0 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Tue, 22 Jan 2019 13:53:14 +0200 Subject: 11156 libzfs: NULL pointer errors Reviewed by: John Levon Approved by: Richard Lowe --- usr/src/lib/libzfs/common/libzfs_dataset.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'usr/src/lib/libzfs/common/libzfs_dataset.c') diff --git a/usr/src/lib/libzfs/common/libzfs_dataset.c b/usr/src/lib/libzfs/common/libzfs_dataset.c index 628125e38b..a0f401de45 100644 --- a/usr/src/lib/libzfs/common/libzfs_dataset.c +++ b/usr/src/lib/libzfs/common/libzfs_dataset.c @@ -2699,7 +2699,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen, /* 'legacy' or 'none' */ (void) strlcpy(propbuf, str, proplen); } - zcp_check(zhp, prop, NULL, propbuf); + zcp_check(zhp, prop, 0, propbuf); break; case ZFS_PROP_ORIGIN: @@ -2707,7 +2707,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen, if (str == NULL) return (-1); (void) strlcpy(propbuf, str, proplen); - zcp_check(zhp, prop, NULL, str); + zcp_check(zhp, prop, 0, str); break; case ZFS_PROP_CLONES: @@ -2797,7 +2797,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen, abort(); } (void) snprintf(propbuf, proplen, "%s", str); - zcp_check(zhp, prop, NULL, propbuf); + zcp_check(zhp, prop, 0, propbuf); break; case ZFS_PROP_MOUNTED: @@ -2823,7 +2823,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen, * consumers. */ (void) strlcpy(propbuf, zhp->zfs_name, proplen); - zcp_check(zhp, prop, NULL, propbuf); + zcp_check(zhp, prop, 0, propbuf); break; case ZFS_PROP_MLSLABEL: @@ -2900,7 +2900,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen, return (-1); (void) strlcpy(propbuf, str, proplen); - zcp_check(zhp, prop, NULL, str); + zcp_check(zhp, prop, 0, str); break; case PROP_TYPE_INDEX: @@ -2911,7 +2911,7 @@ zfs_prop_get(zfs_handle_t *zhp, zfs_prop_t prop, char *propbuf, size_t proplen, return (-1); (void) strlcpy(propbuf, strval, proplen); - zcp_check(zhp, prop, NULL, strval); + zcp_check(zhp, prop, 0, strval); break; default: -- cgit v1.2.3