mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
merges r23918 and r23919 from trunk into ruby_1_9_1.
-- * marshal.c (w_encoding): encodings need extra depth. [ruby-core:24100] -- * test/ruby/test_marshal.rb (TestMarshal#test_limit): test for [ruby-core:24100]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
72c0d800b4
commit
5a7efe4dbf
4 changed files with 8 additions and 2 deletions
|
@ -116,6 +116,7 @@ class TestMarshal < Test::Unit::TestCase
|
|||
def test_limit
|
||||
assert_equal([[[]]], Marshal.load(Marshal.dump([[[]]], 3)))
|
||||
assert_raise(ArgumentError) { Marshal.dump([[[]]], 2) }
|
||||
assert_nothing_raised(ArgumentError, '[ruby-core:24100]') { Marshal.dump("\u3042", 1) }
|
||||
end
|
||||
|
||||
def test_userdef_invalid
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue