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

Add asan_unpoisoning_object to execute the block with unpoisoning

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-07-06 09:39:04 +09:00
parent ec303e49af
commit b1b8172328
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2022-07-10 16:38:51 +09:00 
Merged: https://github.com/ruby/ruby/pull/6092
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gc.c
View File

@ -1409,6 +1409,21 @@ asan_unpoison_object_temporary(VALUE obj)
return ptr;
}
static inline void *
asan_poison_object_restore(VALUE obj, void *ptr)
{
if (ptr) {
asan_poison_object(obj);
}
return NULL;
}
#define asan_unpoisoning_object(obj) \
for (void *poisoned = asan_unpoison_object_temporary(obj), \
*unpoisoning = &poisoned; /* flag to loop just once */ \
unpoisoning; \
unpoisoning = asan_poison_object_restore(obj, poisoned))
#define FL_CHECK2(name, x, pred) \
((RGENGC_CHECK_MODE && SPECIAL_CONST_P(x)) ? \
(rb_bug(name": SPECIAL_CONST (%p)", (void *)(x)), 0) : (pred))
@ -13945,14 +13960,10 @@ rb_raw_obj_info_buitin_type(char *const buff, const size_t buff_size, const VALU
const char *
rb_raw_obj_info(char *const buff, const size_t buff_size, VALUE obj)
{
void *poisoned = asan_unpoison_object_temporary(obj);
size_t pos = rb_raw_obj_info_common(buff, buff_size, obj);
pos = rb_raw_obj_info_buitin_type(buff, buff_size, obj, pos);
if (pos >= buff_size) {} // truncated
if (poisoned) {
asan_poison_object(obj);
asan_unpoisoning_object(obj) {
size_t pos = rb_raw_obj_info_common(buff, buff_size, obj);
pos = rb_raw_obj_info_buitin_type(buff, buff_size, obj, pos);
if (pos >= buff_size) {} // truncated
}
return buff;