Update rehash check to raise if bound increases during iteration

sferik · sferik · commit c52ed5ca4133 · 2025-07-16T17:08:13.000-07:00
diff --git a/hash.c b/hash.c
@@ -1300,9 +1300,9 @@ hash_ar_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
 
     if (error) return ST_STOP;
 
-    ar_table *tbl = RHASH_AR_TABLE(arg->hash);
+    unsigned bound = RHASH_AR_TABLE_BOUND(arg->hash);
     int status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
-    if (!RHASH_AR_TABLE_P(arg->hash) || RHASH_AR_TABLE(arg->hash) != tbl) {
+    if (!RHASH_AR_TABLE_P(arg->hash) || RHASH_AR_TABLE_BOUND(arg->hash) > bound) {
         rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1300,9 +1300,9 @@ hash_ar_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)`
`1300`	`1300`
`1301`	`1301`	`if (error) return ST_STOP;`
`1302`	`1302`
`1303`		`- ar_table *tbl = RHASH_AR_TABLE(arg->hash);`
	`1303`	`+ unsigned bound = RHASH_AR_TABLE_BOUND(arg->hash);`
`1304`	`1304`	`int status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);`
`1305`		`- if (!RHASH_AR_TABLE_P(arg->hash) \|\| RHASH_AR_TABLE(arg->hash) != tbl) {`
	`1305`	`+ if (!RHASH_AR_TABLE_P(arg->hash) \|\| RHASH_AR_TABLE_BOUND(arg->hash) > bound) {`
`1306`	`1306`	`rb_raise(rb_eRuntimeError, "rehash occurred during iteration");`
`1307`	`1307`	`}`
`1308`	`1308`