Duplicate options before mutating them

rails · Apr 18, 2013 · 3ba6ae9 · 3ba6ae9
1 parent 6183e1a
commit 3ba6ae9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/actionpack/lib/action_dispatch/http/url.rb b/actionpack/lib/action_dispatch/http/url.rb
@@ -28,6 +28,7 @@ def extract_subdomain(host, tld_length = @@tld_length)
         end
 
         def url_for(options = {})
+          options = options.dup
           path  = options.delete(:script_name).to_s.chomp("/")
           path << options.delete(:path).to_s
 

diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -170,9 +170,10 @@ def initialize(route, options)
 
             def call(t, args)
               if args.size == arg_size && !args.last.is_a?(Hash) && optimize_routes_generation?(t)
-                @options.merge!(t.url_options) if t.respond_to?(:url_options)
+                options = @options.dup
-                @options[:path] = optimized_helper(args)
+                options.merge!(t.url_options) if t.respond_to?(:url_options)
-                ActionDispatch::Http::URL.url_for(@options)
+                options[:path] = optimized_helper(args)
+                ActionDispatch::Http::URL.url_for(options)
               else
                 super
               end