Author: delphij
Date: Fri Aug 23 23:37:55 2013
New Revision: 254748
URL: http://svnweb.freebsd.org/changeset/base/254748
Log:
Update vendor/illumos/dist to 14152:46f5fb0b0d36:
Illumos DTrace issues:
4061 libzfs: memory leak in iter_dependents_cb()
Modified:
vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c
Modified: vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c
==============================================================================
--- vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c Fri Aug 23 23:36:27
2013 (r254747)
+++ vendor/illumos/dist/lib/libzfs/common/libzfs_iter.c Fri Aug 23 23:37:55
2013 (r254748)
@@ -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 <stdio.h>
@@ -443,8 +443,12 @@ iter_dependents_cb(zfs_handle_t *zhp, vo
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);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
