Ticket #8425: json_decode_alternating_quote_types_with_test.diff

activesupport/test/json/decoding_test.rb

@@ -13 +13 @@
-    %(1)     => 1,
-    %("")    => "",
-    %("\\"") => "\"",
+    %("'':") => "'':",
-    %(null)  => nil,
-    %(true)  => true,
-    %(false) => false

activesupport/lib/active_support/json/decoding.rb

@@ -22 +22 @@
-          while scanner.scan_until(/(['":,]|\\.)/)
-            case char = scanner[1]
-            when '"', "'"
-char
+(quoting ? quoting : char)
-            when ":", ","
-              marks << scanner.pos - 1 unless quoting
-            end