3 files changed, 34 insertions, 4 deletions
diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
index 87d9cd7f7d..753ee0fbdf 100755
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -601,6 +601,8 @@ class JSONGeneratorTest < Test::Unit::TestCase
     assert_equal too_deep, ok
     ok = generate too_deep_ary, :max_nesting => 0
     assert_equal too_deep, ok
+
+    assert_raise(TypeError) { generate too_deep_ary, max_nesting: "garbage" }
   end
 
   def test_backslash
diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index 67d86a0b35..292ca1a670 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -545,22 +545,26 @@ class JSONParserTest < Test::Unit::TestCase
   end
 
   def test_backslash
+    assert_raise(JSON::ParserError) do
+      JSON.parse('"\\')
+    end
+
     data = [ '\\.(?i:gif|jpe?g|png)$' ]
     json = '["\\\\.(?i:gif|jpe?g|png)$"]'
     assert_equal data, parse(json)
-    #
+
     data = [ '\\"' ]
     json = '["\\\\\""]'
     assert_equal data, parse(json)
-    #
+
     json = '["/"]'
     data = [ '/' ]
     assert_equal data, parse(json)
-    #
+
     json = '["\""]'
     data = ['"']
     assert_equal data, parse(json)
-    #
+
     json = '["\\/"]'
     data = ["/"]
     assert_equal data, parse(json)
@@ -878,6 +882,22 @@ class JSONParserTest < Test::Unit::TestCase
     end
   end
 
+  def test_mutating_source_string_during_parsing
+    expected = ([1] * 100) + [2.3] + ([1] * 100)
+    source = JSON.generate(expected)
+    expected.delete_at(100)
+
+    fake_decimal_class = Class.new
+    fake_decimal_class.define_method(:initialize) do |number|
+      source.tr!('1', '0')
+      number.to_f
+    end
+
+    actual = JSON.parse(source, decimal_class: fake_decimal_class)
+    actual.delete_at(100)
+    assert_equal expected, actual
+  end
+
   private
 
   def assert_equal_float(expected, actual, delta = 1e-2)
diff --git a/test/json/json_ryu_fallback_test.rb b/test/json/json_ryu_fallback_test.rb
index 152de7e360..a61b3e668d 100644
--- a/test/json/json_ryu_fallback_test.rb
+++ b/test/json/json_ryu_fallback_test.rb
@@ -179,5 +179,13 @@ class JSONRyuFallbackTest < Test::Unit::TestCase
     assert_equal(-0.0, JSON.parse("-99999999999999999e-4294967296"))
     assert_equal(-Float::INFINITY, JSON.parse("-1e4294967295"))
     assert_equal(-Float::INFINITY, JSON.parse("-1e4294967297"))
+
+    assert_equal(Float::INFINITY, JSON.parse("1e9223372036854775808"))
+    assert_equal(Float::INFINITY, JSON.parse("1e9999999999999999999"))
+    assert_equal(Float::INFINITY, JSON.parse("1e18446744073709551616"))
+    assert_equal(Float::INFINITY, JSON.parse("1e10000000000000000000"))
+    assert_equal(Float::INFINITY, JSON.parse("1e184467440737095516160"))
+    assert_equal 0.0, JSON.parse("1e-18446744073709551615")
+    assert_equal 0.0, JSON.parse("1e-9223372036854775809")
   end
 end