diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-13 06:03:06 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-13 06:03:06 +0000 |
commit | c1ad9a5fd1a4d468a4c941e0cf5a6f5b9f90d2df (patch) | |
tree | 769282fc2acdc53a3546e7aa513f8242d4710cf5 | |
parent | 2ce744032b38771dd1a6aa87b9118621bea3b3aa (diff) | |
download | ruby-c1ad9a5fd1a4d468a4c941e0cf5a6f5b9f90d2df.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 1 |
2 files changed, 5 insertions, 1 deletions
@@ -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 @@ -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")) { |