diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:08:46 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 14:08:46 +0000 |
commit | d2cf4be9113d1e958eede3d760ffb1589df1115f (patch) | |
tree | 173774dfc4596d38447df7ea557a89ee806713ff | |
parent | 897483c97955ee38181ee93a2d3317f61ee7d058 (diff) |
merge revision(s) 16473:
* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sprintf.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Jun 15 23:08:29 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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@ruby-lang.org> * process.c (rb_f_system): set last_status when status == -1 because @@ -743,6 +743,8 @@ rb_f_sprintf(argc, argv) need = strlen(expr); if ((!isnan(fval) && fval < 0.0) || (flags & FPLUS)) need++; + else if (flags & FSPACE) + need++; if ((flags & FWIDTH) && need < width) need = width; @@ -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 |