Merge pull request rails#53243 from jhawthorn/erb_loop

Fix infinite loop in ERBTracker
JoeDupuis · Oct 9, 2024 · f1be11a · f1be11a
2 parents 27e5f71 + 24d1660
commit f1be11a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/actionview/lib/action_view/dependency_tracker/erb_tracker.rb b/actionview/lib/action_view/dependency_tracker/erb_tracker.rb
@@ -127,7 +127,8 @@ def add_static_dependency(dependencies, dependency, quote_type)
                 wildcard_dependency << scanner.pre_match
 
                 while unmatched_brackets > 0 && !scanner.eos?
-                  scanner.scan_until(/[{}]/)
+                  found = scanner.scan_until(/[{}]/)
+                  return unless found
 
                   case scanner.matched
                   when "{"

diff --git a/actionview/test/template/dependency_tracker_test.rb b/actionview/test/template/dependency_tracker_test.rb
@@ -247,6 +247,19 @@ def test_dependencies_with_interpolation_non_trailing
 
     assert_equal [ "*/comments" ], tracker.dependencies
   end
+
+  def test_dependencies_with_interpolation_expr
+    view_paths = ActionView::PathSet.new([File.expand_path("../fixtures/digestor", __dir__)])
+
+    template = FakeTemplate.new(%q{
+      <%= render "orders/#{variable || "default"}" %>
+    }, :erb)
+
+    tracker = make_tracker("interpolation/_string", template, view_paths)
+
+    # unsupported
+    assert_equal [], tracker.dependencies
+  end
 end
 
 class ERBTrackerTest < ActiveSupport::TestCase