1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Fix an issue with JSON encoding of "Infinity" and "NaN" values

- When `as_json` returns `Infinity` or `NaN` as the value of any of the key,
  we don't used to call `as_json` on it as it was treated as primitive.
- This used to pass `Infinity` or `NaN` to `JSON.generate` and Ruby used
  to throw an error for `Infinity/NaN not allowed in JSON.`
- This patch changes the code to call `as_json` on these primitives so
  that they are converted to proper values before being passed to
  `JSON.generate`.
- Fixes #26877.
This commit is contained in:
Prathamesh Sonpatki 2016-10-30 14:12:43 +05:30
parent fe1f4b2ad5
commit 8776f15b44
No known key found for this signature in database
GPG key ID: 8B90F6B89E2BCB71
2 changed files with 23 additions and 1 deletions

View file

@ -84,7 +84,7 @@ module ActiveSupport
when String
EscapedString.new(value)
when Numeric, NilClass, TrueClass, FalseClass
value
value.as_json
when Hash
Hash[value.map { |k, v| [jsonify(k), jsonify(v)] }]
when Array

View file

@ -432,6 +432,28 @@ EXPECTED
assert_equal '"foo"', ActiveSupport::JSON.encode(exception)
end
class InfiniteNumber
def as_json(options = nil)
{ "number" => 1.0 / 0 }
end
end
def test_to_json_works_when_as_json_returns_infinite_number
expected = { number: nil }.to_json
assert_equal expected, InfiniteNumber.new.to_json
end
class NaNNumber
def as_json(options = nil)
{ "number" => 0.0 / 0 }
end
end
def test_to_json_works_when_as_json_returns_NaN_number
expected = { number: nil }.to_json
assert_equal expected, NaNNumber.new.to_json
end
protected
def object_keys(json_object)