avoid panic (#4841)

hashicorp · Jun 27, 2018 · c2f8c0f · c2f8c0f
1 parent c8b6452
commit c2f8c0f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/vault/identity_store_util.go b/vault/identity_store_util.go
@@ -1389,6 +1389,9 @@ func (i *IdentityStore) collectGroupsReverseDFS(group *identity.Group, visited m
 		if err != nil {
 			return nil, err
 		}
+		if parentGroup == nil {
+			continue
+		}
 		pGroups, err := i.collectGroupsReverseDFS(parentGroup, visited, groups)
 		if err != nil {
 			return nil, fmt.Errorf("failed to collect group at parent group ID %q", parentGroup.ID)
@@ -1418,6 +1421,9 @@ func (i *IdentityStore) collectPoliciesReverseDFS(group *identity.Group, visited
 		if err != nil {
 			return nil, err
 		}
+		if parentGroup == nil {
+			continue
+		}
 		parentPolicies, err := i.collectPoliciesReverseDFS(parentGroup, visited, policies)
 		if err != nil {
 			return nil, fmt.Errorf("failed to collect policies at parent group ID %q", parentGroup.ID)