shyouhei	2008-06-15 23:19:35 +0900 (Sun, 15 Jun 2008)

  New Revision: 17325

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/object.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16570:
    * object.c (rb_cstr_to_dbl): should clear errno before calling
      strtod(3).  [ruby-dev:34834]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/object.c?r1=17325&r2=17324&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17325&r2=17324&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17325&r2=17324&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17324)
+++ ruby_1_8_5/ChangeLog	(revision 17325)
@@ -1,3 +1,8 @@
+Sun Jun 15 23:19:14 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* object.c (rb_cstr_to_dbl): should clear errno before calling
+	  strtod(3).  [ruby-dev:34834]
+
 Sun Jun 15 23:17:34 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* marshal.c (marshal_load): should initialize arg.data used for
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17324)
+++ ruby_1_8_5/version.h	(revision 17325)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 214
+#define RUBY_PATCHLEVEL 215
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/object.c
===================================================================
--- ruby_1_8_5/object.c	(revision 17324)
+++ ruby_1_8_5/object.c	(revision 17325)
@@ -2203,6 +2203,7 @@
     else {
 	while (ISSPACE(*p) || *p == '_') p++;
     }
+    errno = 0;
     d = strtod(p, &end);
     if (errno == ERANGE) {
 	OutOfRange();

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/