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

Ensure global variable traces are freed at exit

Browse Source 
ASAN_OPTIONS="detect_leaks=1" RUBY_FREE_AT_EXIT=1 ./miniruby -e 'trace_var(:$x){}'
This commit is contained in:
John Hawthorn 2024-11-19 21:05:39 -08:00
parent a8ebc596d6
commit 34e36a72a7
Notes: git 2024-11-23 09:17:06 +00:00 
Merged: https://github.com/ruby/ruby/pull/12146
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
variable.c
View File

@ -453,15 +453,27 @@ struct rb_global_entry {
bool ractor_local; bool ractor_local;
}; };
static void
free_global_variable(struct rb_global_variable *var)
{
RUBY_ASSERT(var->counter == 0);
struct trace_var *trace = var->trace;
while (trace) {
struct trace_var *next = trace->next;
xfree(trace);
trace = next;
}
xfree(var);
}
static enum rb_id_table_iterator_result static enum rb_id_table_iterator_result
free_global_entry_i(VALUE val, void *arg) free_global_entry_i(VALUE val, void *arg)
{ {
struct rb_global_entry *entry = (struct rb_global_entry *)val; struct rb_global_entry *entry = (struct rb_global_entry *)val;
if (entry->var->counter == 1) {
ruby_xfree(entry->var);
}
else {
entry->var->counter--; entry->var->counter--;
if (entry->var->counter == 0) {
free_global_variable(entry->var);
} }
ruby_xfree(entry); ruby_xfree(entry);
return ID_TABLE_DELETE; return ID_TABLE_DELETE;
@ -1007,13 +1019,7 @@ rb_alias_variable(ID name1, ID name2)
} }
var->counter--; var->counter--;
if (var->counter == 0) { if (var->counter == 0) {
struct trace_var *trace = var->trace; free_global_variable(var);
while (trace) {
struct trace_var *next = trace->next;
xfree(trace);
trace = next;
}
xfree(var);
} }
} }
else { else {