1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[ruby-dev:40388]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2010-02-13 06:03:06 +00:00
parent 2ce744032b
commit c1ad9a5fd1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Sat Feb 13 12:17:52 2010 Tanaka Akira <akr@fsij.org>
* lib/tempfile.rb (Tempfile::Remover): new class to replace * lib/tempfile.rb (Tempfile::Remover): new class to replace

1
marshal.c
View File

@ -1130,7 +1130,6 @@ id2encidx(ID id, VALUE val, struct load_arg *arg)
{ {
if (id == rb_id_encoding()) { if (id == rb_id_encoding()) {
int idx = rb_enc_find_index(StringValueCStr(val)); int idx = rb_enc_find_index(StringValueCStr(val));
r_entry(val, arg);
return idx; return idx;
} }
else if (id == rb_intern("E")) { else if (id == rb_intern("E")) {