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

Fix potential issue in wmap_cmp for dead entries

Browse Source 
wmap_cmp will always return true for dead entries since dead entries have
a Qundef value. When the keys have a hash collision, this may cause the
wrong entry to be returned.

This commit changes wmap_cmp to compare by weakmap_entry pointers when
the entry is dead.
This commit is contained in:
Peter Zhu 2024-10-23 12:53:32 -04:00
parent 4755d28f9b
commit c1ca331cf4
Notes: git 2024-10-24 13:45:48 +00:00 
Merged: https://github.com/ruby/ruby/pull/11944
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
weakmap.c
View File

@ -221,7 +221,15 @@ static const rb_data_type_t weakmap_type = {
static int static int
wmap_cmp(st_data_t x, st_data_t y) wmap_cmp(st_data_t x, st_data_t y)
{ {
return *(VALUE *)x != *(VALUE *)y; VALUE x_obj = *(VALUE *)x;
VALUE y_obj = *(VALUE *)y;
if (!wmap_live_p(x_obj) && !wmap_live_p(y_obj)) {
return x != y;
}
else {
return x_obj != y_obj;
}
} }
static st_index_t static st_index_t