Merge pull request #613 from presidentbeef/fix_shadow_block_args

Fix handling of shadowed block args
presidentbeef · Jan 28, 2015 · b7cb568 · b7cb568
2 parents f8a5011 + 7470f27
commit b7cb568
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/lib/brakeman/processors/alias_processor.rb b/lib/brakeman/processors/alias_processor.rb
@@ -182,7 +182,7 @@ def process_call_with_block exp
           env.current[Sexp.new(:lvar, e.lhs)] = e.rhs
         elsif node_type? e, :kwarg
           env.current[Sexp.new(:lvar, e[1])] = e[2]
-        elsif node_type? e, :masgn
+        elsif node_type? e, :masgn, :shadow
           e[1..-1].each do |var|
             local = Sexp.new(:lvar, var)
             env.current[local] = local

diff --git a/test/tests/alias_processor.rb b/test/tests/alias_processor.rb
@@ -437,6 +437,26 @@ def a
     OUTPUT
   end
 
+  def test_shadowed_block_arg
+    assert_output <<-INPUT, <<-OUTPUT
+      def a
+        y = 1
+        x do |w; y, z|
+          y = 2
+        end
+        puts y
+      end
+    INPUT
+      def a
+        y = 1
+        x do |w; y, z|
+          y = 2
+        end
+        puts 1
+      end
+    OUTPUT
+  end
+
   def test_block_in_class_scope
     # Make sure blocks in class do not mess up instance variable scope
     # for subsequent methods