From f77d40235275c80a4e1771b55a9d2c86bf129b26 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 25 Nov 2014 18:43:47 +0000
Subject: safe.c: preserve encoding

* safe.c (rb_insecure_operation): preserve encoding of the called
  method name in error messages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 safe.c                 | 4 ++--
 test/ruby/test_file.rb | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/safe.c b/safe.c
index 7f3a412686..d790156c03 100644
--- a/safe.c
+++ b/safe.c
@@ -110,8 +110,8 @@ rb_insecure_operation(void)
 {
     ID caller_name = rb_frame_callee();
     if (caller_name) {
-	rb_raise(rb_eSecurityError, "Insecure operation - %s",
-		 rb_id2name(caller_name));
+	rb_raise(rb_eSecurityError, "Insecure operation - %"PRIsVALUE,
+		 rb_id2str(caller_name));
     }
     else {
 	rb_raise(rb_eSecurityError, "Insecure operation: -r");
diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index 0825c5dd7b..16b76b71fe 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -390,6 +390,12 @@ class TestFile < Test::Unit::TestCase
     (0..1).each do |level|
       assert_nothing_raised(SecurityError, bug5374) {in_safe[level]}
     end
+    def (s = Object.new).to_path; "".taint; end
+    m = "\u{691c 67fb}"
+    (c = Class.new(File)).singleton_class.class_eval {alias_method m, :stat}
+    assert_raise_with_message(SecurityError, /#{m}/) {
+      proc {$SAFE = 3; c.__send__(m, s)}.call
+    }
   end
 
   if /(bcc|ms|cyg)win|mingw|emx/ =~ RUBY_PLATFORM
-- 
cgit v1.2.3