From bd3b0d470c12fbdb48efcdb310d00eaa0fea84e5 Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 3 Oct 2011 21:21:31 +0000
Subject: * ext/psych/lib/psych/scalar_scanner.rb: Match values against the  
 floating point spec defined in YAML to avoid erronious parses. *
 test/psych/test_numeric.rb: corresponding test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                             |  6 ++++++
 ext/psych/lib/psych/scalar_scanner.rb | 12 +++++++++++-
 test/psych/test_numeric.rb            | 14 ++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 test/psych/test_numeric.rb

diff --git a/ChangeLog b/ChangeLog
index d0e9872d4f..7be3dc3651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct  4 06:20:19 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: Match values against the
+	  floating point spec defined in YAML to avoid erronious parses.
+	* test/psych/test_numeric.rb: corresponding test.
+
 Tue Oct  4 05:59:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/visitors/to_ruby.rb: ToRuby visitor can be
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
index b92d3c075e..3e8acbb21c 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -7,6 +7,12 @@ module Psych
     # Taken from http://yaml.org/type/timestamp.html
     TIME = /^\d{4}-\d{1,2}-\d{1,2}([Tt]|\s+)\d{1,2}:\d\d:\d\d(\.\d*)?(\s*Z|[-+]\d{1,2}(:\d\d)?)?/
 
+    # Taken from http://yaml.org/type/float.html
+    FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9.]*([eE][-+][0-9]+)?(?# base 10)
+              |[-+]?[0-9][0-9_,]*(:[0-5]?[0-9])+\.[0-9_]*(?# base 60)
+              |[-+]?\.(inf|Inf|INF)(?# infinity)
+              |\.(nan|NaN|NAN)(?# not a number))$/x
+
     # Create a new scanner
     def initialize
       @string_cache = {}
@@ -67,10 +73,14 @@ module Psych
           i += (n.to_f * 60 ** (e - 2).abs)
         end
         i
+      when FLOAT
+        return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
+
+        @string_cache[string] = true
+        string
       else
         if string.count('.') < 2
           return Integer(string.gsub(/[,_]/, '')) rescue ArgumentError
-          return Float(string.gsub(/[,_]/, '')) rescue ArgumentError
         end
 
         @string_cache[string] = true
diff --git a/test/psych/test_numeric.rb b/test/psych/test_numeric.rb
new file mode 100644
index 0000000000..9adb058a32
--- /dev/null
+++ b/test/psych/test_numeric.rb
@@ -0,0 +1,14 @@
+require 'psych/helper'
+
+module Psych
+  ###
+  # Test numerics from YAML spec:
+  # http://yaml.org/type/float.html
+  # http://yaml.org/type/int.html
+  class TestNumeric < TestCase
+    def test_non_float_with_0
+      str = Psych.load('--- 090')
+      assert_equal '090', str
+    end
+  end
+end
-- 
cgit v1.2.3