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

4 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 11d7ed6f69..de8f58cfc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul  1 08:46:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_encoding): encodings need extra depth.
+	  [ruby-core:24100]
+
 Tue Jun 30 17:44:24 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* re.c (reg_match_pos): adjust offset based on characters, not
diff --git a/marshal.c b/marshal.c
index 89f9315d13..b76d012bc4 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
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
diff --git a/version.h b/version.h
index c159da4f36..a92b159bb6 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-07-12"
-#define RUBY_PATCHLEVEL 213
+#define RUBY_PATCHLEVEL 214
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1