archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge r37148 from ruby_1_8_7.

Browse source 
* error.c (name_err_to_s): we need not infect msg.

* test/ruby/test_exception.rb (TestException#test_exception_to_s_should_not_propagate_untrustedness): test for it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@37220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2012-10-16 08:55:07 +00:00
parent 4928543d61
commit 2c791e967a
3 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Oct 16 17:00:36 2012 Akinori MUSHA <knu@iDaemons.org>
* error.c (name_err_to_s): we need not infect msg.
* test/ruby/test_exception.rb (TestException#test_exception_to_s_should_not_propagate_untrustedness): test for it.
Tue Oct 16 16:51:08 2012 Akinori MUSHA <knu@iDaemons.org>
* ext/bigdecimal/bigdecimal.c (VpMemAlloc): Fixes a bug reported

3
error.c
View file

@ -665,9 +665,6 @@ name_err_to_s(exc)
if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
StringValue(str);
if (str != mesg) {
OBJ_INFECT(str, mesg);
}
return str;
}

30
test/ruby/test_exception.rb
View file

@ -204,6 +204,34 @@ class TestException < Test::Unit::TestCase
o.taint
e = NameError.new(o)
s = e.to_s
assert_equal(true, s.tainted?)
assert_equal(false, s.tainted?)
end
def test_exception_to_s_should_not_propagate_untrustedness
favorite_lang = "Ruby"
for exc in [Exception, NameError]
assert_raise(SecurityError) do
lambda {
$SAFE = 4
exc.new(favorite_lang).to_s
favorite_lang.replace("Python")
}.call
end
end
assert_raise(SecurityError) do
lambda {
$SAFE = 4
o = Object.new
(class << o; self; end).send(:define_method, :to_str) {
favorite_lang
}
NameError.new(o).to_s
favorite_lang.replace("Python")
}.call
end
assert_equal("Ruby", favorite_lang)
end
end