From 30116ff8c286c91090722f4d6aada2cc47fcae7e Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 29 Sep 2004 05:15:33 +0000 Subject: * array.c (rb_ary_delete): comparison may change the capacity. [ruby-dev:24348] * array.c (rb_ary_fill): fill should honor length argument. [ruby-dev:24346] * array.c (rb_ary_replace): should not use ptr from shared array. [ruby-dev:24345] * ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK. [ruby-talk:113807] * array.c (flatten): element size might change during comparison. [ruby-dev:24343] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- marshal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'marshal.c') diff --git a/marshal.c b/marshal.c index f602fffca3..91eadb4cd7 100644 --- a/marshal.c +++ b/marshal.c @@ -437,7 +437,7 @@ w_ivar(tbl, arg) { if (tbl) { w_long(tbl->num_entries, arg->arg); - st_foreach(tbl, w_obj_each, (st_data_t)arg); + st_foreach_safe(tbl, w_obj_each, (st_data_t)arg); } else { w_long(0, arg->arg); @@ -621,7 +621,7 @@ w_object(obj, arg, limit) w_byte(TYPE_HASH_DEF, arg); } w_long(RHASH(obj)->tbl->num_entries, arg); - st_foreach(RHASH(obj)->tbl, hash_each, (st_data_t)&c_arg); + rb_hash_foreach(obj, hash_each, (st_data_t)&c_arg); if (!NIL_P(RHASH(obj)->ifnone)) { w_object(RHASH(obj)->ifnone, arg, limit); } -- cgit v1.2.3