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

1 files changed, 1 insertions, 1 deletions

diff --git a/marshal.c b/marshal.c
index 89f9315d1..b76d012bc 100644
--- a/marshal.c
+++ b/marshal.c
@@ -496,7 +496,7 @@ w_encoding(VALUE obj, long num, struct dump_call_arg *arg)
 	name = (st_data_t)rb_str_new2(rb_enc_name(enc));
 	st_insert(arg->arg->encodings, (st_data_t)rb_enc_name(enc), name);
     } while (0);
-    w_object(name, arg->arg, arg->limit);
+    w_object(name, arg->arg, arg->limit + 1);
 }
 
 static void