From 5cce0d3360319ecf0c0067adad36d5c76d406316 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Jul 2009 14:45:57 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_marshal.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'test/ruby') diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index af389d2b2..268acf2a3 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 -- cgit