fix atexit when it is called from an atexit handler

The old code accepted atexit handlers after exit, but did not run them
reliably. C11 seems to explicitly allow atexit to fail (and report
such failure) in this case, but this situation can easily come up in
C++ if a destructor has a local static object with a destructor so it
should be handled.

Note that the memory usage can grow linearly with the overall number
of registered atexit handlers instead of with the worst case list
length. (This only matters if atexit handlers keep registering atexit
handlers which should not happen in practice).

Commit message/rationale based on text by Szabolcs Nagy.

diff --git a/src/exit/atexit.c b/src/exit/atexit.c
index be8271811ead741349879fa41f96ab1a01f9d0cf..2b58b8bbf7416ad378f0068553417f9c50ff9c3f 100644 (file)
--- a/src/exit/atexit.c
+++ b/src/exit/atexit.c
@@ -12,18 +12,16 @@ static struct fl
        void *a[COUNT];
 } builtin, *head;
 
+static int slot;
 static volatile int lock[2];
 
 void __funcs_on_exit()
 {
-       int i;
        void (*func)(void *), *arg;
        LOCK(lock);
-       for (; head; head=head->next) for (i=COUNT-1; i>=0; i--) {
-               if (!head->f[i]) continue;
-               func = head->f[i];
-               arg = head->a[i];
-               head->f[i] = 0;
+       for (; head; head=head->next, slot=COUNT) while(slot-->0) {
+               func = head->f[slot];
+               arg = head->a[slot];
                UNLOCK(lock);
                func(arg);
                LOCK(lock);
@@ -36,15 +34,13 @@ void __cxa_finalize(void *dso)
 
 int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
 {
-       int i;
-
        LOCK(lock);
 
        /* Defer initialization of head so it can be in BSS */
        if (!head) head = &builtin;
 
        /* If the current function list is full, add a new one */
-       if (head->f[COUNT-1]) {
+       if (slot==COUNT) {
                struct fl *new_fl = calloc(sizeof(struct fl), 1);
                if (!new_fl) {
                        UNLOCK(lock);
@@ -52,12 +48,13 @@ int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
                }
                new_fl->next = head;
                head = new_fl;
+               slot = 0;
        }
 
        /* Append function to the list. */
-       for (i=0; i<COUNT && head->f[i]; i++);
-       head->f[i] = func;
-       head->a[i] = arg;
+       head->f[slot] = func;
+       head->a[slot] = arg;
+       slot++;
 
        UNLOCK(lock);
        return 0;