From caa2bb47b35969918e67d3339441750255edb18c Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 30 Jan 2010 12:49:10 +0000 Subject: [PATCH] merges r25377 from trunk into ruby_1_9_1. -- * st.c (unpack_entries): save table->bins and never change the table during unpacking. Because st_insert() may cause GC and refer the table, i.e. st_foreach(). [Bug #2196] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26490 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ st.c | 16 +++++++++------- version.h | 2 +- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba7777015d..ae439dde4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 17 00:05:53 2009 wanabe + + * st.c (unpack_entries): save table->bins and never change the table + during unpacking. Because st_insert() may cause GC and refer the + table, i.e. st_foreach(). [Bug #2196] + Fri Oct 16 18:42:18 2009 Nobuyoshi Nakada * bootstraptest/test_gc.rb: added tests based on [ruby-dev:39484] diff --git a/st.c b/st.c index c6821467b3..541531d717 100644 --- a/st.c +++ b/st.c @@ -367,15 +367,17 @@ unpack_entries(register st_table *table) { int i; struct st_table_entry *packed_bins[MAX_PACKED_NUMHASH*2]; - int num_entries = table->num_entries; + st_table tmp_table = *table; - memcpy(packed_bins, table->bins, sizeof(struct st_table_entry *) * num_entries*2); - table->entries_packed = 0; - table->num_entries = 0; - memset(table->bins, 0, sizeof(struct st_table_entry *) * table->num_bins); - for (i = 0; i < num_entries; i++) { - st_insert(table, (st_data_t)packed_bins[i*2], (st_data_t)packed_bins[i*2+1]); + memcpy(packed_bins, table->bins, sizeof(struct st_table_entry *) * table->num_entries*2); + table->bins = packed_bins; + tmp_table.entries_packed = 0; + tmp_table.num_entries = 0; + memset(tmp_table.bins, 0, sizeof(struct st_table_entry *) * tmp_table.num_bins); + for (i = 0; i < table->num_entries; i++) { + st_insert(&tmp_table, (st_data_t)packed_bins[i*2], (st_data_t)packed_bins[i*2+1]); } + *table = tmp_table; } int diff --git a/version.h b/version.h index 10a1f8bc55..3293aef592 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 395 +#define RUBY_PATCHLEVEL 396 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1