kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* hash.c (rb_hash_s_create): set nil as the value if assoc length

Browse source 
is not enough.  [ruby-core:21249]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-01-11 00:47:32 +00:00
parent b802f1bb02
commit 5a38751d02
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jan 11 09:47:30 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_hash_s_create): set nil as the value if assoc length
is not enough. [ruby-core:21249]
Sat Jan 10 21:17:28 2009 Tanaka Akira <akr@fsij.org> Sat Jan 10 21:17:28 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/mkconstants.rb: don't generate unintended newlines. * ext/socket/mkconstants.rb: don't generate unintended newlines.

10
hash.c
View file

@ -348,10 +348,16 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
hash = hash_alloc(klass); hash = hash_alloc(klass);
for (i = 0; i < RARRAY_LEN(tmp); ++i) { for (i = 0; i < RARRAY_LEN(tmp); ++i) {
VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]); VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
VALUE key, val = Qnil;
if (NIL_P(v)) continue; if (NIL_P(v)) continue;
if (RARRAY_LEN(v) < 1 || 2 < RARRAY_LEN(v)) continue; switch (RARRAY_LEN(v)) {
rb_hash_aset(hash, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]); case 2:
val = RARRAY_PTR(v)[1];
case 1:
key = RARRAY_PTR(v)[0];
rb_hash_aset(hash, key, val);
}
} }
return hash; return hash;
} }