diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-06 15:44:26 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-06 15:44:26 +0000 |
commit | b0eab6daaf92edd20af4b1d15bb689facab3f409 (patch) | |
tree | 59d9d60fc40b48cde2882bc34e7e1ea5b4acdb48 | |
parent | 6234672a9d1f1da588f61e7db0a2df66ae901076 (diff) |
* hash.c (rb_hash_default): should not call default procedure if
no key is given. [ruby-list:42541]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10479 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | hash.c | 1 |
2 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Fri Jul 7 00:38:49 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * hash.c (rb_hash_default): should not call default procedure if + no key is given. [ruby-list:42541] + Fri Jul 7 00:29:10 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * time.c (time_mload): a patch from Daniel Berger @@ -508,6 +508,7 @@ rb_hash_default(argc, argv, hash) rb_scan_args(argc, argv, "01", &key); if (FL_TEST(hash, HASH_PROC_DEFAULT)) { + if (argc == 0) return Qnil; return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, key); } return RHASH(hash)->ifnone; |