* 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

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e45e1a4fb8..c9ebd81035 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 11:49:00 2007  Nobuyoshi Nakada  <[email protected]>
+
+	* sprintf.c (rb_f_sprintf): should not check positional number as
+	  width.  [ruby-core:11838]
+
 Wed Aug 22 11:47:11 2007  Nobuyoshi Nakada  <[email protected]>
 
 	* bignum.c (rb_big_aref): check for Bignum index range.
diff --git a/sprintf.c b/sprintf.c
index 76093faba7..de997098ba 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 a4d85e2658..20a615ebf5 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