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

* hash.c (rb_hash_aset, recursive_hash): rejects recursive hash.

Browse Source 
[ruby-core:22921]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-07-16 09:30:23 +00:00
parent 415d5ebc2f
commit 1cd0ddea1b
2 changed files with 9 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 @@
Thu Jul 16 18:30:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* hash.c (rb_hash_aset, recursive_hash): rejects recursive hash.
[ruby-core:22921]
Thu Jul 16 18:28:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jul 16 18:28:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* id.c (Init_id), vm.c (vm_exec): @#__ThrowState__ is no longer * id.c (Init_id), vm.c (vm_exec): @#__ThrowState__ is no longer

5
hash.c
View File

@ -1016,6 +1016,9 @@ VALUE
rb_hash_aset(VALUE hash, VALUE key, VALUE val) rb_hash_aset(VALUE hash, VALUE key, VALUE val)
{ {
rb_hash_modify(hash); rb_hash_modify(hash);
if (hash == key) {
rb_raise(rb_eArgError, "recursive key for hash");
}
if (RHASH(hash)->ntbl->type == &identhash || rb_obj_class(key) != rb_cString) { if (RHASH(hash)->ntbl->type == &identhash || rb_obj_class(key) != rb_cString) {
st_insert(RHASH(hash)->ntbl, key, val); st_insert(RHASH(hash)->ntbl, key, val);
} }
@ -1546,7 +1549,7 @@ recursive_hash(VALUE hash, VALUE dummy, int recur)
VALUE hval; VALUE hval;
if (recur) { if (recur) {
return LONG2FIX(0); rb_raise(rb_eArgError, "recursive key for hash");
} }
if (!RHASH(hash)->ntbl) if (!RHASH(hash)->ntbl)
return LONG2FIX(0); return LONG2FIX(0);