diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-12 14:45:57 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-12 14:45:57 +0000 |
| commit | 5a7efe4dbf22dee4b5b105154294bc21be63a517 (patch) | |
| tree | f31311e3186b98ebe2d104f3d04a9bb3c1bdf9cf /test | |
| parent | 72c0d800b47324cebc95e1ddc5effb8c5e8323a6 (diff) | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_marshal.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index af389d2b2d..268acf2a32 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -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 |