svn commit: r289531 - head/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Sun Oct 18 18:32:22 2015
New Revision: 289531
URL: https://svnweb.freebsd.org/changeset/base/289531

Log:
  MFV r289530: 5847 libzfs_diff should check zfs_prop_get() return
  
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Reviewed by: Albert Lee <trisk at omniti.com>
  Approved by: Dan McDonald <danmcd at omniti.com>
  Author: Alexander Eremin <a.eremin at nexenta.com>
  
  illumos/illumos-gate at 8430278980a48338e04c7dd52b495b7f1551367a

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c	Sun Oct 18 18:30:47 2015	(r289530)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c	Sun Oct 18 18:32:22 2015	(r289531)
@@ -21,6 +21,7 @@
 
 /*
  * 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, co
 
 		zhp = zfs_open(hdl, di->ds, ZFS_TYPE_FILESYSTEM);
 		while (zhp != NULL) {
-			(void) zfs_prop_get(zhp, ZFS_PROP_ORIGIN,
-			    origin, sizeof (origin), &src, NULL, 0, B_FALSE);
-
+			if (zfs_prop_get(zhp, ZFS_PROP_ORIGIN, origin,
+			    sizeof (origin), &src, NULL, 0, B_FALSE) != 0) {
+				(void) zfs_close(zhp);
+				zhp = NULL;
+				break;
+			}
 			if (strncmp(origin, fromsnap, fsnlen) == 0)
 				break;