summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 22:58:47 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-15 22:58:47 +0000
commit20c6dcf46cecec3f0f3928852f932400c0d9bb89 (patch)
tree6f11ced10c33a79a172ba3a3410993ec50ea668e
parentbc97a5086051b9cc8319e73c2977341772fbc6da (diff)
downloadruby-20c6dcf46cecec3f0f3928852f932400c0d9bb89.tar.gz
* sprintf.c (rb_f_sprintf): should not check positional number as
width. [ruby-core:11838] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@13042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--sprintf.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6286aec2c3..e0eac8f6c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 16 07:58:18 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * sprintf.c (rb_f_sprintf): should not check positional number as
+ width. [ruby-core:11838]
+
Thu Aug 16 07:52:24 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (conv_to_posix_path): removed.
diff --git a/sprintf.c b/sprintf.c
index c762d086b4..be6d274512 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -342,7 +342,6 @@ rb_f_sprintf(argc, argv)
case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9':
- CHECK_FOR_WIDTH(flags);
n = 0;
GETNUM(n, width);
if (*p == '$') {
@@ -353,6 +352,7 @@ rb_f_sprintf(argc, argv)
p++;
goto retry;
}
+ CHECK_FOR_WIDTH(flags);
width = n;
flags |= FWIDTH;
goto retry;
diff --git a/version.h b/version.h
index 097c86a7da..779cac9d19 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-16"
#define RUBY_VERSION_CODE 185
#define RUBY_RELEASE_CODE 20070816
-#define RUBY_PATCHLEVEL 89
+#define RUBY_PATCHLEVEL 90
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8