diff options
| author | delphij <delphij@FreeBSD.org> | 2013-08-24 00:29:34 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2013-08-24 00:29:34 +0000 |
| commit | 40685a92a99aec264dbd377ff9ffbdbd837c2db4 (patch) | |
| tree | 06d7fe42190c08092923e799693de607b393d34e /cddl | |
| parent | be3d457caae387b1bb46148d42378dac65c6dde6 (diff) | |
| download | FreeBSD-src-40685a92a99aec264dbd377ff9ffbdbd837c2db4.zip FreeBSD-src-40685a92a99aec264dbd377ff9ffbdbd837c2db4.tar.gz | |
MFV r254748:
Fix memory leak in libzfs's iter_dependents_cb().
Illumos ZFS issues:
4061 libzfs: memory leak in iter_dependents_cb()
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c index 278bfd4..259d045 100644 --- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c +++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c @@ -21,10 +21,10 @@ /* * 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 (c) 2012 Pawel Jakub Dawidek <pawel@dawidek.net>. * All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include <stdio.h> @@ -452,8 +452,12 @@ iter_dependents_cb(zfs_handle_t *zhp, void *arg) } ida->stack = isf.next; } + if (!first && err == 0) err = ida->func(zhp, ida->data); + else + zfs_close(zhp); + return (err); } |
