diff options
-rw-r--r-- | libc/stdlib/_atexit.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libc/stdlib/_atexit.c b/libc/stdlib/_atexit.c index 4bb884075..ef6772fb5 100644 --- a/libc/stdlib/_atexit.c +++ b/libc/stdlib/_atexit.c @@ -241,6 +241,16 @@ struct exit_function attribute_hidden *__new_exitfn(void) __UCLIBC_MUTEX_LOCK(__atexit_lock); + /* + * Reuse free slots at the end of the list. + * This avoids eating memory when dlopen and dlclose modules multiple times. + */ + while (__exit_count > 0) { + if (__exit_function_table[__exit_count-1].type == ef_free) { + --__exit_count; + } else break; + } + #ifdef __UCLIBC_DYNAMIC_ATEXIT__ /* If we are out of function table slots, make some more */ if (__exit_slots < __exit_count+1) { |