From 4a42b101a9521b74ded79f2dc1b6260533abca8c Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 27 Jan 2011 14:30:00 +0000 Subject: * st.c (st_foreach): check if unpacked. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30679 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- st.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'st.c') diff --git a/st.c b/st.c index a076280c31..ba21b31a5b 100644 --- a/st.c +++ b/st.c @@ -745,6 +745,7 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) key = (st_data_t)table->bins[i*2]; val = (st_data_t)table->bins[i*2+1]; retval = (*func)(key, val, arg); + if (!table->entries_packed) goto unpacked; switch (retval) { case ST_CHECK: /* check if hash is modified during iteration */ for (j = 0; j < table->num_entries; j++) { @@ -770,9 +771,17 @@ st_foreach(st_table *table, int (*func)(ANYARGS), st_data_t arg) } } return 0; + unpacked: + ptr = table->head; + while (i-- > 0) { + if (!(ptr = ptr->fore)) return 0; + } + } + else { + ptr = table->head; } - if ((ptr = table->head) != 0) { + if (ptr != 0) { do { i = ptr->hash % table->num_bins; retval = (*func)(ptr->key, ptr->record, arg); -- cgit v1.2.3