6548000 sharemgr dumps core on allocation failure

6549790 NFS sharemgr dumps core on allocation failure
6559696 sharemgr: get_one_filesystem() leaks zfs handles
6559699 sharemgr: sa_scf_init() leaks scf instance and scope

1 files changed, 16 insertions, 4 deletions

diff --git a/usr/src/lib/libshare/common/libshare.c b/usr/src/lib/libshare/common/libshare.c
index 6d43efbcff..8e4e9b3c91 100644
--- a/usr/src/lib/libshare/common/libshare.c
+++ b/usr/src/lib/libshare/common/libshare.c
@@ -974,11 +974,23 @@ sa_get_group(sa_handle_t handle, char *groupname)
 	if (impl_handle != NULL && impl_handle->tree != NULL) {
 		if (groupname != NULL) {
 			group = strdup(groupname);
-			subgroup = strchr(group, '/');
-			if (subgroup != NULL)
-				*subgroup++ = '\0';
+			if (group != NULL) {
+				subgroup = strchr(group, '/');
+				if (subgroup != NULL)
+					*subgroup++ = '\0';
+			}
 		}
-		node = find_group_by_name(impl_handle->tree, (xmlChar *)group);
+		/*
+		 * We want to find the, possibly, named group. If
+		 * group is not NULL, then lookup the name. If it is
+		 * NULL, we only do the find if groupname is also
+		 * NULL. This allows lookup of the "first" group in
+		 * the internal list.
+		 */
+		if (group != NULL || groupname == NULL)
+			node = find_group_by_name(impl_handle->tree,
+			    (xmlChar *)group);
+
 		/* if a subgroup, find it before returning */
 		if (subgroup != NULL && node != NULL)
 			node = find_group_by_name(node, (xmlChar *)subgroup);