Skip to content

Commit e36f933

Browse files
author
Andy Newton
committed
found some conditions where check_groups causes a stack exhaustion
1 parent 16c9334 commit e36f933

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

lib/jcr/check_groups.rb

+1-7
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def self.disallowed_group_in_value? node, mapping
5656
disallowed_group_in_value?( groupee[:group_rule], mapping )
5757
elsif groupee[:target_rule_name]
5858
trule = get_name_mapping( groupee[:target_rule_name][:rule_name], mapping )
59-
disallowed_group_in_value?( trule, mapping )
59+
disallowed_group_in_value?( trule[:rule], mapping )
6060
elsif groupee[:member_rule]
6161
raise_group_error( "groups in value rules cannot have member rules", groupee[:member_rule] )
6262
elsif groupee[:object_rule]
@@ -78,8 +78,6 @@ def self.check_member_for_group node, mapping
7878
disallowed_group_in_member?( trule, mapping )
7979
elsif node[:group_rule]
8080
disallowed_group_in_member?( node[:group_rule], mapping )
81-
else
82-
check_groups( node, mapping )
8381
end
8482
end
8583

@@ -117,8 +115,6 @@ def self.check_array_for_group node, mapping
117115
disallowed_group_in_array?(trule, mapping)
118116
elsif node[:group_rule]
119117
disallowed_group_in_array?(node[:group_rule], mapping)
120-
else
121-
check_groups(node, mapping)
122118
end
123119
end
124120
end
@@ -152,8 +148,6 @@ def self.check_object_for_group node, mapping
152148
disallowed_group_in_object?(trule, mapping)
153149
elsif node[:group_rule]
154150
disallowed_group_in_object?(node[:group_rule], mapping)
155-
else
156-
check_groups(node, mapping)
157151
end
158152
end
159153
end

0 commit comments

Comments
 (0)