d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r289531: 5847 libzfs_diff should check zfs_prop_get() return

Browse Source 
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Albert Lee <trisk@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>
Author: Alexander Eremin <a.eremin@nexenta.com>

illumos/illumos-gate@8430278980
This commit is contained in:
mav 2015-11-13 09:47:37 +00:00
parent b470ddeee2
commit 503dafdd83
1 changed files with 7 additions and 3 deletions

10
cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c

@ -21,6 +21,7 @@
/* /*
* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright 2015 Nexenta Systems, Inc. All rights reserved.
*/ */
/* /*
@ -624,9 +625,12 @@ get_snapshot_names(differ_info_t *di, const char *fromsnap,
zhp = zfs_open(hdl, di->ds, ZFS_TYPE_FILESYSTEM); zhp = zfs_open(hdl, di->ds, ZFS_TYPE_FILESYSTEM);
while (zhp != NULL) { while (zhp != NULL) {
(void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN, if (zfs_prop_get(zhp, ZFS_PROP_ORIGIN, origin,
origin, sizeof (origin), &src, NULL, 0, B_FALSE); sizeof (origin), &src, NULL, 0, B_FALSE) != 0) {
(void) zfs_close(zhp);
zhp = NULL;
break;
}
if (strncmp(origin, fromsnap, fsnlen) == 0) if (strncmp(origin, fromsnap, fsnlen) == 0)
break; break;