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

Fix ruby_free_proctitle

Browse Source 
It is undefined behaviour to free environ as it is managed by the system.
This caused RUBY_FREE_AT_EXIT to double free on systems like Linux. This
commit changes it to only free orig_environ, which is enough to make
both Valgrind and macOS leaks tools to not detect memory leaks.
This commit is contained in:
Peter Zhu 2024-01-12 15:32:24 -05:00
parent 2c27a3a0dd
commit 206388b19e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
missing/setproctitle.c
View File

@ -153,18 +153,16 @@ ruby_free_proctitle(void)
if (!orig_environ) return; /* environ is allocated by OS */
for (int i = 0; environ[i] != NULL; i++) {
xfree(environ[i]);
}
/* ruby_setenv could allocate a new environ, so we need to free both environ
* orig_environ in that case. */
/* ruby_setenv could allocate a new environ, so we need to free orig_environ
* in that case. */
if (environ != orig_environ) {
for (int i = 0; orig_environ[i] != NULL; i++) {
xfree(orig_environ[i]);
}
xfree(orig_environ);
orig_environ = NULL;
}
xfree(environ);
#endif
}