# HG changeset patch # User Marcel Telka # Date 1376598822 -7200 # Node ID 46f5fb0b0d36588e5edc0eff0867aed1fae74a13 # Parent 189ec27885ae06605c1274067d89647d6648a6a8 4061 libzfs: memory leak in iter_dependents_cb() Reviewed by: Jeffry Molanus Reviewed by: Boris Protopopov Reviewed by: Andy Stormont Reviewed by: Matthew Ahrens Approved by: Dan McDonald diff -r 189ec27885ae -r 46f5fb0b0d36 usr/src/lib/libzfs/common/libzfs_iter.c --- a/usr/src/lib/libzfs/common/libzfs_iter.c Tue Aug 20 20:11:52 2013 -0800 +++ b/usr/src/lib/libzfs/common/libzfs_iter.c Thu Aug 15 22:33:42 2013 +0200 @@ -21,8 +21,8 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2010 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include @@ -443,8 +443,12 @@ err = zfs_iter_snapshots(zhp, iter_dependents_cb, ida); ida->stack = isf.next; } + if (!first && err == 0) err = ida->func(zhp, ida->data); + else + zfs_close(zhp); + return (err); }