From 823491511ea24af1f04293ae06f331b393e26ef9 Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 12 Jan 2009 13:32:30 +0000 Subject: merges r21424 from trunk into ruby_1_9_1. * hash.c (rb_hash_s_create): set nil as the value if assoc length is not enough. [ruby-core:21249] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ hash.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6feaa1f96..aecfa80dda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 11 09:47:30 2009 Nobuyoshi Nakada + + * hash.c (rb_hash_s_create): set nil as the value if assoc length + is not enough. [ruby-core:21249] + Sat Jan 10 20:26:17 2009 Tanaka Akira * version.h: make version string succinct: diff --git a/hash.c b/hash.c index a058a00a91..4c78122a02 100644 --- a/hash.c +++ b/hash.c @@ -348,10 +348,16 @@ rb_hash_s_create(int argc, VALUE *argv, VALUE klass) hash = hash_alloc(klass); for (i = 0; i < RARRAY_LEN(tmp); ++i) { VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]); - + VALUE key, val = Qnil; + if (NIL_P(v)) continue; - if (RARRAY_LEN(v) < 1 || 2 < RARRAY_LEN(v)) continue; - rb_hash_aset(hash, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]); + switch (RARRAY_LEN(v)) { + case 2: + val = RARRAY_PTR(v)[1]; + case 1: + key = RARRAY_PTR(v)[0]; + rb_hash_aset(hash, key, val); + } } return hash; } -- cgit v1.2.3