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

* eval.c (recursive_check, recursive_push): more restrictive check.

Browse Source 
fixed: [ruby-dev:25916]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-03-15 14:12:53 +00:00
parent 3173befe84
commit b1d94ab54a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Mar 15 23:12:36 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (recursive_check, recursive_push): more restrictive check.
fixed: [ruby-dev:25916]
Tue Mar 15 16:38:31 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp> Tue Mar 15 16:38:31 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/tkutil/tkutil.c (ary2list): give wrong arguments to hash2kv() * ext/tk/tkutil/tkutil.c (ary2list): give wrong arguments to hash2kv()

4
eval.c
View File

@ -13002,7 +13002,7 @@ recursive_check(obj)
else { else {
VALUE list = rb_hash_aref(hash, ID2SYM(ruby_frame->this_func)); VALUE list = rb_hash_aref(hash, ID2SYM(ruby_frame->this_func));
if (NIL_P(list)) return Qfalse; if (NIL_P(list) || TYPE(list) != T_ARRAY) return Qfalse;
return rb_ary_includes(list, rb_obj_id(obj)); return rb_ary_includes(list, rb_obj_id(obj));
} }
} }
@ -13023,7 +13023,7 @@ recursive_push(obj)
else { else {
list = rb_hash_aref(hash, sym); list = rb_hash_aref(hash, sym);
} }
if (NIL_P(list)) { if (NIL_P(list) || TYPE(list) != T_ARRAY) {
list = rb_ary_new(); list = rb_ary_new();
rb_hash_aset(hash, sym, list); rb_hash_aset(hash, sym, list);
} }