From c1ad9a5fd1a4d468a4c941e0cf5a6f5b9f90d2df Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 13 Feb 2010 06:03:06 +0000
Subject: [PATCH] * 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
---
 ChangeLog | 5 +++++
 marshal.c | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index ff42536ada..b08470f48c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/marshal.c b/marshal.c
index e5ede8c659..deb7d2853b 100644
--- 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")) {