Skip to content

Commit 87b671f

Browse files
nabijaczlewelibehlendorf
authored andcommitted
libzfsbootenv: lzbe_set_boot_device(): don't free undefined pointer
Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #11993
1 parent c493943 commit 87b671f

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

lib/libzfsbootenv/lzbe_device.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,11 @@ lzbe_set_boot_device(const char *pool, lzbe_flags_t flag, const char *device)
8888
if (strncmp(device, "zfs:", 4) == 0) {
8989
fnvlist_add_string(nv, OS_BOOTONCE, device);
9090
} else {
91-
descriptor = NULL;
92-
if (asprintf(&descriptor, "zfs:%s:", device) > 0)
91+
if (asprintf(&descriptor, "zfs:%s:", device) > 0) {
9392
fnvlist_add_string(nv, OS_BOOTONCE, descriptor);
94-
else
93+
free(descriptor);
94+
} else
9595
rv = ENOMEM;
96-
free(descriptor);
9796
}
9897
}
9998

0 commit comments

Comments
 (0)