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

* st.c (unpack_entries): save table->bins and never change the table

Browse Source 
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/trunk@25377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
wanabe 2009-10-16 15:12:31 +00:00
parent 02689d147d
commit 3e946fe301
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Oct 17 00:05:53 2009 wanabe <s.wanabe@gmail.com>
* 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 22:20:25 2009 Tanaka Akira <akr@fsij.org> Fri Oct 16 22:20:25 2009 Tanaka Akira <akr@fsij.org>
* prelude.rb (require_relative): defined as a module function of * prelude.rb (require_relative): defined as a module function of

16
st.c
View File

@ -418,15 +418,17 @@ unpack_entries(register st_table *table)
{ {
int i; int i;
struct st_table_entry *packed_bins[MAX_PACKED_NUMHASH*2]; 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); memcpy(packed_bins, table->bins, sizeof(struct st_table_entry *) * table->num_entries*2);
table->entries_packed = 0; table->bins = packed_bins;
table->num_entries = 0; tmp_table.entries_packed = 0;
memset(table->bins, 0, sizeof(struct st_table_entry *) * table->num_bins); tmp_table.num_entries = 0;
for (i = 0; i < num_entries; i++) { memset(tmp_table.bins, 0, sizeof(struct st_table_entry *) * tmp_table.num_bins);
st_insert(table, (st_data_t)packed_bins[i*2], (st_data_t)packed_bins[i*2+1]); 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 int