diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-10-23 14:16:14 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-10-23 14:16:14 +0900 |
| commit | 18fbe4d0b74aa6e787b908a5509f834c7a1d6a18 (patch) | |
| tree | eba131e23e6b219de3be5bdf8951640792ef2707 /src | |
| parent | 32f9cdc97d769554f01543ede73a702e0c973346 (diff) | |
| download | mruby-18fbe4d0b74aa6e787b908a5509f834c7a1d6a18.tar.gz mruby-18fbe4d0b74aa6e787b908a5509f834c7a1d6a18.zip | |
do not touch h from Hash when h might be NULL
Diffstat (limited to 'src')
| -rw-r--r-- | src/hash.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/hash.c b/src/hash.c index 92dfff186..51f85f4e8 100644 --- a/src/hash.c +++ b/src/hash.c @@ -970,9 +970,10 @@ mrb_hash_keys(mrb_state *mrb, mrb_value hash) { khash_t(ht) *h = RHASH_TBL(hash); khiter_t k; - mrb_value ary = mrb_ary_new_capa(mrb, kh_size(h)); + mrb_value ary; - if (!h) return ary; + if (!h) return mrb_ary_new(mrb); + ary = mrb_ary_new_capa(mrb, kh_size(h)); for (k = kh_begin(h); k != kh_end(h); k++) { if (kh_exist(h, k)) { mrb_value v = kh_key(h,k); @@ -1000,9 +1001,10 @@ mrb_hash_values(mrb_state *mrb, mrb_value hash) { khash_t(ht) *h = RHASH_TBL(hash); khiter_t k; - mrb_value ary = mrb_ary_new_capa(mrb, kh_size(h)); + mrb_value ary; - if (!h) return ary; + if (!h) return mrb_ary_new(mrb); + ary = mrb_ary_new_capa(mrb, kh_size(h)); for (k = kh_begin(h); k != kh_end(h); k++) { if (kh_exist(h, k)){ mrb_value v = kh_value(h,k); |