merge revision(s) 46569: [Backport #9982]

	* sprintf.c (GETASTER): should not use the numbered argument to be
	  formatted, raise ArgumentError instead.
	  [ruby-dev:48330] [Bug #9982]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 36 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 89c30d21f9..6334d5dd70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep 10 11:50:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (GETASTER): should not use the numbered argument to be
+	  formatted, raise ArgumentError instead.
+	  [ruby-dev:48330] [Bug #9982]
+
 Wed Sep 10 11:43:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
diff --git a/sprintf.c b/sprintf.c
index 18e745593d..15259960fc 100644
--- a/sprintf.c
+++ b/sprintf.c
@@ -104,6 +104,9 @@ sign_bits(int base, const char *p)
 } while (0)
 
 #define GETARG() (nextvalue != Qundef ? nextvalue : \
+		  GETNEXTARG())
+
+#define GETNEXTARG() ( \
     posarg == -1 ? \
     (rb_raise(rb_eArgError, "unnumbered(%d) mixed with numbered", nextarg), 0) : \
     posarg == -2 ? \
@@ -147,7 +150,7 @@ sign_bits(int base, const char *p)
 	tmp = GETPOSARG(n); \
     } \
     else { \
-	tmp = GETARG(); \
+	tmp = GETNEXTARG(); \
 	p = t; \
     } \
     (val) = NUM2INT(tmp); \
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index c330850e5c..52879f8d8a 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -423,6 +423,26 @@ eom
           clone.tap {|a| a.message = message}
         end
       end
+
+      # derived from MiniTest 2.1.0
+      def assert_raise_with_message(exception, expected, msg = nil, &block)
+        case expected
+        when String
+          assert = :assert_equal
+        when Regexp
+          assert = :assert_match
+        else
+          raise TypeError, "Expected #{expected.inspect} to be a kind of String or Regexp, not #{expected.class}"
+        end
+
+        ex = assert_raise(exception, *msg) { yield }
+        if assert == :assert_equal
+          assert_equal(expected, ex.message, msg || "Expected exception(#{exception}) was raised, but the message doesn't match")
+        else
+          assert(expected =~ ex.message, msg || "Expected #{expected} to match #{ex.message}")
+          block.binding.eval("proc{|_|$~=_}").call($~)
+        end
+      end
     end
   end
 end
diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb
index 21329dcd66..b7a29e9ebe 100644
--- a/test/ruby/test_sprintf.rb
+++ b/test/ruby/test_sprintf.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require_relative 'envutil'
 
 class TestSprintf < Test::Unit::TestCase
   def test_positional
@@ -179,6 +180,10 @@ class TestSprintf < Test::Unit::TestCase
     assert_raise(ArgumentError) { sprintf("%!", 1) }
     assert_raise(ArgumentError) { sprintf("%1$1$d", 1) }
     assert_raise(ArgumentError) { sprintf("%0%") }
+
+    assert_raise_with_message(ArgumentError, /unnumbered\(1\) mixed with numbered/) { sprintf("%1$*d", 3) }
+    assert_raise_with_message(ArgumentError, /unnumbered\(1\) mixed with numbered/) { sprintf("%1$.*d", 3) }
+
     verbose, $VERBOSE = $VERBOSE, nil
     assert_nothing_raised { sprintf("", 1) }
   ensure
diff --git a/version.h b/version.h
index f2df10dee6..3a92dbff0f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-09-10"
-#define RUBY_PATCHLEVEL 558
+#define RUBY_PATCHLEVEL 559
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9