* marshal.c (id2encidx): duplicated entry for encoding name.

[ruby-dev:40388] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-02-13 06:03:06 +00:00 · 2010-02-13 06:03:06 +00:00 · c1ad9a5fd1
commit c1ad9a5fd1
parent 2ce744032b
2 changed files with 5 additions and 1 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Sat Feb 13 15:01:24 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* marshal.c (id2encidx): duplicated entry for encoding name.
+	  [ruby-dev:40388]
+
 Sat Feb 13 12:17:52 2010  Tanaka Akira  <akr@fsij.org>

 	* lib/tempfile.rb (Tempfile::Remover): new class to replace
--- a/marshal.c
+++ b/marshal.c
@ -1130,7 +1130,6 @@ id2encidx(ID id, VALUE val, struct load_arg *arg)
 {
    if (id == rb_id_encoding()) {
 	int idx = rb_enc_find_index(StringValueCStr(val));
-	r_entry(val, arg);
 	return idx;
    }
    else if (id == rb_intern("E")) {