mirror of
https://github.com/kemko/liquid.git
synced 2026-01-05 09:45:40 +03:00
Use a loop to strictly parse binary comparisons to avoid recursion (#892)
Using recursion allows a malicious template to cause a SystemStackError
This commit is contained in:
committed by
GitHub
parent
8928454e29
commit
62d4625468
@@ -83,17 +83,20 @@ module Liquid
|
||||
|
||||
def strict_parse(markup)
|
||||
p = Parser.new(markup)
|
||||
condition = parse_binary_comparison(p)
|
||||
condition = parse_binary_comparisons(p)
|
||||
p.consume(:end_of_string)
|
||||
condition
|
||||
end
|
||||
|
||||
def parse_binary_comparison(p)
|
||||
def parse_binary_comparisons(p)
|
||||
condition = parse_comparison(p)
|
||||
if op = (p.id?('and'.freeze) || p.id?('or'.freeze))
|
||||
condition.send(op, parse_binary_comparison(p))
|
||||
first_condition = condition
|
||||
while op = (p.id?('and'.freeze) || p.id?('or'.freeze))
|
||||
child_condition = parse_comparison(p)
|
||||
condition.send(op, child_condition)
|
||||
condition = child_condition
|
||||
end
|
||||
condition
|
||||
first_condition
|
||||
end
|
||||
|
||||
def parse_comparison(p)
|
||||
|
||||
Reference in New Issue
Block a user