aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dependency.rb
diff options
context:
space:
mode:
authorMike McQuaid2016-01-17 20:11:57 +0000
committerMike McQuaid2016-01-17 20:12:03 +0000
commit20106e42684b3befd3de6c3dece9c2a6ec88871c (patch)
treee007a70d5c5ae931af51640e5f51ed0ab1b2344c /Library/Homebrew/dependency.rb
parent42681b51f83193f0fb9c178c85e2d1b17926ebd2 (diff)
downloadbrew-20106e42684b3befd3de6c3dece9c2a6ec88871c.tar.bz2
dependency: don't recurse infinitely.
If we have a dependency cycle ensure that infinite recursion does not result by storing state in a stack which we push/pop from for each level of recursion and verify that we haven’t been through this dependency already. Closes Homebrew/homebrew#47933. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/dependency.rb')
-rw-r--r--Library/Homebrew/dependency.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/Library/Homebrew/dependency.rb b/Library/Homebrew/dependency.rb
index 0e03ae0ea..ca500faef 100644
--- a/Library/Homebrew/dependency.rb
+++ b/Library/Homebrew/dependency.rb
@@ -71,25 +71,31 @@ class Dependency
# The default filter, which is applied when a block is not given, omits
# optionals and recommendeds based on what the dependent has asked for.
def expand(dependent, deps = dependent.deps, &block)
+ # Keep track dependencies to avoid infinite cyclic dependency recursion.
+ @expand_stack ||= []
+ @expand_stack.push dependent.name
+
expanded_deps = []
deps.each do |dep|
- # FIXME: don't hide cyclic dependencies
next if dependent.name == dep.name
case action(dependent, dep, &block)
when :prune
next
when :skip
+ next if @expand_stack.include? dep.name
expanded_deps.concat(expand(dep.to_formula, &block))
when :keep_but_prune_recursive_deps
expanded_deps << dep
else
+ next if @expand_stack.include? dep.name
expanded_deps.concat(expand(dep.to_formula, &block))
expanded_deps << dep
end
end
+ @expand_stack.pop
merge_repeats(expanded_deps)
end