Merge pull request #5 from casperisfine/handle-nan-and-inf

Raise an error if trying to serialize NaN or Infinity

Author: jhawthorn

ext/rapidjson/encoder.hh

@@ -77,7 +77,13 @@ class RubyObjectEncoder {
 
     void encode_float(VALUE v) {
         double f = rb_float_value(v);
-        writer.Double(f);
+        if (isinf(f)) {
+            rb_raise(rb_eEncodeError, "Float::INFINITY is not allowed in JSON");
+        } else if (isnan(f)) {
+            rb_raise(rb_eEncodeError, "Float::NAN is not allowed in JSON");
+        } else {
+            writer.Double(f);
+        }
     }
 
     void encode_string(VALUE v) {

test/test_encoder.rb

@@ -119,4 +119,23 @@ def test_encode_false
   def test_encode_nil
     assert_equal "null", encode(nil)
   end
+
+  def test_encode_NaN
+    error = assert_raises RapidJSON::EncodeError do
+      encode(Float::NAN)
+    end
+    assert_match "Float::NAN is not allowed in JSON", error.message
+  end
+
+  def test_encode_Infinity
+    error = assert_raises RapidJSON::EncodeError do
+      encode(Float::INFINITY)
+    end
+    assert_match "Float::INFINITY is not allowed in JSON", error.message
+
+    error = assert_raises RapidJSON::EncodeError do
+      encode(-Float::INFINITY)
+    end
+    assert_match "Float::INFINITY is not allowed in JSON", error.message
+  end
 end

test/test_parser.rb

@@ -78,4 +78,14 @@ def test_parse_too_deep
       assert parse("["*(max+1) + "]"*(max+1))
     end
   end
+
+  def test_parse_NaN_and_Infinity
+    assert_raises RapidJSON::ParseError do
+      parse("NaN")
+    end
+
+    assert_raises RapidJSON::ParseError do
+      parse("Infinity")
+    end
+  end
 end