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 + + * marshal.c (id2encidx): duplicated entry for encoding name. + [ruby-dev:40388] + Sat Feb 13 12:17:52 2010 Tanaka Akira * 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")) {