Mutate resource_limits hash to flag that the limit was reached (for outside observation)

This commit is contained in:
Florian Weingarten
2013-05-31 09:34:23 -04:00
parent 9075b428b1
commit 2b17e24b16
2 changed files with 9 additions and 1 deletions
+4 -1
View File
@@ -108,7 +108,10 @@ module Liquid
token_output = (token.respond_to?(:render) ? token.render(context) : token)
context.resource_limits[:render_length_current] += (token_output.respond_to?(:length) ? token_output.length : 1)
raise MemoryError.new("Memory limits exceeded") if context.resource_limits_reached?
if context.resource_limits_reached?
context.resource_limits[:reached] = true
raise MemoryError.new("Memory limits exceeded")
end
output << token_output
rescue MemoryError => e
raise e
+5
View File
@@ -76,6 +76,7 @@ class TemplateTest < Test::Unit::TestCase
t = Template.parse("0123456789")
t.resource_limits = { :render_length_limit => 5 }
assert_equal "Liquid error: Memory limits exceeded", t.render()
assert t.resource_limits[:reached]
t.resource_limits = { :render_length_limit => 10 }
assert_equal "0123456789", t.render()
assert_not_nil t.resource_limits[:render_length_current]
@@ -85,9 +86,11 @@ class TemplateTest < Test::Unit::TestCase
t = Template.parse("{% for a in (1..10) %} {% for a in (1..10) %} foo {% endfor %} {% endfor %}")
t.resource_limits = { :render_score_limit => 50 }
assert_equal "Liquid error: Memory limits exceeded", t.render()
assert t.resource_limits[:reached]
t = Template.parse("{% for a in (1..100) %} foo {% endfor %}")
t.resource_limits = { :render_score_limit => 50 }
assert_equal "Liquid error: Memory limits exceeded", t.render()
assert t.resource_limits[:reached]
t.resource_limits = { :render_score_limit => 200 }
assert_equal (" foo " * 100), t.render()
assert_not_nil t.resource_limits[:render_score_current]
@@ -97,6 +100,7 @@ class TemplateTest < Test::Unit::TestCase
t = Template.parse("{% assign foo = 42 %}{% assign bar = 23 %}")
t.resource_limits = { :assign_score_limit => 1 }
assert_equal "Liquid error: Memory limits exceeded", t.render()
assert t.resource_limits[:reached]
t.resource_limits = { :assign_score_limit => 2 }
assert_equal "", t.render()
assert_not_nil t.resource_limits[:assign_score_current]
@@ -106,5 +110,6 @@ class TemplateTest < Test::Unit::TestCase
t = Template.parse("{% for a in (1..100) %} foo1 {% endfor %} bar {% for a in (1..100) %} foo2 {% endfor %}")
t.resource_limits = { :render_score_limit => 50 }
assert_equal "Liquid error: Memory limits exceeded", t.render()
assert t.resource_limits[:reached]
end
end # TemplateTest