Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 15:30:39 -07:00
Code Issues Packages Projects Releases Wiki Activity

Reorder constructor to avoid referencing uninitialized variable when environment contains a self-referencing proc

Browse Source
This commit is contained in:
Jason Hiltz-Laforge
2014-07-24 18:58:23 +00:00
parent d07b12dc7d
commit 052ef9fcb8
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/context.rb
+6 -6
View File
@@ -19,11 +19,12 @@ module Liquid
SQUARE_BRACKETED = /\A\[(.*)\]\z/m
def initialize(environments = {}, outer_scope = {}, registers = {}, rethrow_errors = false, resource_limits = {})
@environments = [environments].flatten
@scopes = [(outer_scope || {})]
@registers = registers
@errors = []
@resource_limits = (resource_limits || {}).merge!({ :render_score_current => 0, :assign_score_current => 0 })
@environments = [environments].flatten
@scopes = [(outer_scope || {})]
@registers = registers
@errors = []
@resource_limits = (resource_limits || {}).merge!({ :render_score_current => 0, :assign_score_current => 0 })
@parsed_variables = Hash.new{ |cache, markup| cache[markup] = variable_parse(markup) }
squash_instance_assigns_with_environments
if rethrow_errors
@@ -32,7 +33,6 @@ module Liquid
@interrupts = []
@filters = []
@parsed_variables = Hash.new{ |cache, markup| cache[markup] = variable_parse(markup) }
end
def increment_used_resources(key, obj)