[ruby-dev:9470] [patch] segv in Hash.delete

あおきです。

次のスクリプトが落ちます。

h = { 1 => true, 2 => true }
h.each do |k,v|
  h.delete 1
end

こんな感じでしょうか。
-------------------------------------------------------------------
あおきみねろう

--- org.st.c	Wed Mar 22 21:30:18 2000
+++ st.c	Wed Mar 22 21:46:23 2000
@@ -435,7 +435,7 @@
     }
 
     for(; ptr != 0; ptr = ptr->next) {
-	if (EQUAL(table, ptr->key, *key)) {
+	if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) {
 	    table->num_entries--;
 	    *key = ptr->key;
 	    if (value != 0) *value = ptr->record;
--- org.hash.c	Wed Mar 22 21:45:33 2000
+++ hash.c	Wed Mar 22 21:49:36 2000
@@ -411,10 +411,11 @@
     VALUE val;
 
     rb_hash_modify(hash);
-    if (RHASH(hash)->iter_lev > 0 &&
-	st_delete_safe(RHASH(hash)->tbl, &key, &val, Qundef)) {
-	FL_SET(hash, HASH_DELETED);
-	return val;
+    if (RHASH(hash)->iter_lev > 0) {
+	if (st_delete_safe(RHASH(hash)->tbl, &key, &val, Qundef)) {
+	    FL_SET(hash, HASH_DELETED);
+	    return val;
+	}
     }
     else if (st_delete(RHASH(hash)->tbl, &key, &val))
 	return val;

Wed Mar 22 21:49:36 2000  Minero Aoki  <[e-mail]>

	* st.c (st_delete_safe): skip already deleted entry.

	* hash.c (rb_hash_delete): modify brace miss.