shyouhei	2008-06-15 23:08:46 +0900 (Sun, 15 Jun 2008)

  New Revision: 17309

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

  Log:
    merge revision(s) 16473:
    * sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.


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

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17308)
+++ ruby_1_8_5/ChangeLog	(revision 17309)
@@ -1,3 +1,7 @@
+Sun Jun 15 23:08:29 2008  NAKAMURA Usaku  <usa@r...>
+
+	* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
+
 Sun Jun 15 23:06:49 2008  NAKAMURA Usaku  <usa@r...>
 
 	* process.c (rb_f_system): set last_status when status == -1 because
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17308)
+++ ruby_1_8_5/version.h	(revision 17309)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 210
+#define RUBY_PATCHLEVEL 211
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/sprintf.c
===================================================================
--- ruby_1_8_5/sprintf.c	(revision 17308)
+++ ruby_1_8_5/sprintf.c	(revision 17309)
@@ -743,6 +743,8 @@
 		    need = strlen(expr);
 		    if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS))
 			need++;
+		    else if (flags & FSPACE)
+			need++;
 		    if ((flags & FWIDTH) && need < width)
 			need = width;
 

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