Fix render length resource limit so it doesn't multiply nested output

This commit is contained in:
Dylan Thacker-Smith
2020-09-03 11:13:04 -04:00
parent 3b486425b0
commit ae9dbe0ca7
5 changed files with 38 additions and 31 deletions
+24 -6
View File
@@ -2,8 +2,8 @@
module Liquid
class ResourceLimits
attr_accessor :render_length, :render_score, :assign_score,
:render_length_limit, :render_score_limit, :assign_score_limit
attr_accessor :render_length_limit, :render_score_limit, :assign_score_limit
attr_reader :render_score, :assign_score
def initialize(limits)
@render_length_limit = limits[:render_length_limit]
@@ -12,14 +12,32 @@ module Liquid
reset
end
def increment_render_score(amount)
@render_score += amount
raise_limits_reached if @render_score_limit && @render_score > @render_score_limit
end
def increment_assign_score(amount)
@assign_score += amount
raise_limits_reached if @assign_score_limit && @assign_score > @assign_score_limit
end
def check_render_length(output_byte_size)
raise_limits_reached if @render_length_limit && output_byte_size > @render_length_limit
end
def raise_limits_reached
@reached_limit = true
raise MemoryError, "Memory limits exceeded"
end
def reached?
(@render_length_limit && @render_length > @render_length_limit) ||
(@render_score_limit && @render_score > @render_score_limit) ||
(@assign_score_limit && @assign_score > @assign_score_limit)
@reached_limit
end
def reset
@render_length = @render_score = @assign_score = 0
@reached_limit = false
@render_score = @assign_score = 0
end
end
end