summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 02:53:31 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 02:53:31 +0000
commitd9e196fd3da5d46e3a064cb6c93262d56e7bc048 (patch)
tree7639e5bea5709d14be1fc615c36082e596f19e6a
parent215f80a9a021d40f63de1b811d81f48fd5424d42 (diff)
* 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_6@13210 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 e45e1a4..c9ebd81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 11:49:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * sprintf.c (rb_f_sprintf): should not check positional number as
+ width. [ruby-core:11838]
+
Wed Aug 22 11:47:11 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* bignum.c (rb_big_aref): check for Bignum index range.
diff --git a/sprintf.c b/sprintf.c
index 76093fa..de99709 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 a4d85e2..20a615e 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2007-08-22"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070822
-#define RUBY_PATCHLEVEL 81
+#define RUBY_PATCHLEVEL 82
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8