* sprintf.c (rb_str_format): fix exception message encoding.

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

1 files changed, 38 insertions, 0 deletions

diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb
index 58884d19b1..ecbce36942 100644
--- a/test/ruby/test_sprintf.rb
+++ b/test/ruby/test_sprintf.rb
@@ -333,6 +333,25 @@ class TestSprintf < Test::Unit::TestCase
     assert_equal("named<key2> after <key>", e.message)
   end
 
+  def test_named_untyped_enc
+    key = "\u{3012}"
+    [Encoding::UTF_8, Encoding::EUC_JP].each do |enc|
+      k = key.encode(enc)
+      e = assert_raise(ArgumentError) {sprintf("%1$<#{k}>s", key: "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named<#{k}> after numbered", e.message)
+      e = assert_raise(ArgumentError) {sprintf("%s%s%<#{k}>s", "foo", "bar", key: "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named<#{k}> after unnumbered(2)", e.message)
+      e = assert_raise(ArgumentError) {sprintf("%<key><#{k}>s", key: "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named<#{k}> after <key>", e.message)
+      e = assert_raise(ArgumentError) {sprintf("%<#{k}><key>s", k.to_sym => "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named<key> after <#{k}>", e.message)
+    end
+  end
+
   def test_named_typed
     assert_equal("value", sprintf("%{key}", :key => "value"))
     e = assert_raise(ArgumentError) {sprintf("%1${key2}", :key => "value")}
@@ -343,4 +362,23 @@ class TestSprintf < Test::Unit::TestCase
     assert_equal("named{key2} after <key>", e.message)
     assert_equal("value{key2}", sprintf("%{key}{key2}", :key => "value"))
   end
+
+  def test_named_typed_enc
+    key = "\u{3012}"
+    [Encoding::UTF_8, Encoding::EUC_JP].each do |enc|
+      k = key.encode(enc)
+      e = assert_raise(ArgumentError) {sprintf("%1${#{k}}s", key: "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named{#{k}} after numbered", e.message)
+      e = assert_raise(ArgumentError) {sprintf("%s%s%{#{k}}s", "foo", "bar", key: "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named{#{k}} after unnumbered(2)", e.message)
+      e = assert_raise(ArgumentError) {sprintf("%<key>{#{k}}s", key: "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named{#{k}} after <key>", e.message)
+      e = assert_raise(ArgumentError) {sprintf("%<#{k}>{key}s", k.to_sym => "value")}
+      assert_equal(enc, e.message.encoding)
+      assert_equal("named{key} after <#{k}>", e.message)
+    end
+  end
 end