lib/brakeman/processors/template_alias_processor.rb in brakeman-4.5.0 vs lib/brakeman/processors/template_alias_processor.rb in brakeman-4.5.1

- old
+ new

@@ -12,25 +12,24 @@ FORM_METHODS = Set[:form_for, :remote_form_for, :form_remote_for] def initialize tracker, template, called_from = nil super tracker @template = template + @current_file = template.file @called_from = called_from end #Process template - def process_template name, args, _, line = nil, file_name = nil - @file_name = file_name || relative_path(@template.file || @tracker.templates[@template.name]) - + def process_template name, args, _, line = nil if @called_from if @called_from.include_template? name Brakeman.debug "Skipping circular render from #{@template.name} to #{name}" return end - super name, args, @called_from.dup.add_template_render(@template.name, line, @file_name), line + super name, args, @called_from.dup.add_template_render(@template.name, line, @current_file), line else - super name, args, Brakeman::RenderPath.new.add_template_render(@template.name, line, @file_name), line + super name, args, Brakeman::RenderPath.new.add_template_render(@template.name, line, @current_file), line end end #Determine template name def template_name name