fix segfault in lutimes when tv argument is NULL

[musl] / src / exit / atexit.c

diff --git a/src/exit/atexit.c b/src/exit/atexit.c
index c31f3dc..854e9fd 100644 (file)
--- a/src/exit/atexit.c
+++ b/src/exit/atexit.c
@@ -1,8 +1,13 @@
-#include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <limits.h>
 #include "libc.h"
+#include "lock.h"
+#include "fork_impl.h"
+
+#define malloc __libc_malloc
+#define calloc __libc_calloc
+#define realloc undef
+#define free undef
 
 /* Ensure that at least 32 atexit handlers can be registered without malloc */
 #define COUNT 32
@@ -14,18 +19,17 @@ static struct fl
        void *a[COUNT];
 } builtin, *head;
 
-static int lock[2];
+static int slot;
+static volatile int lock[1];
+volatile int *const __atexit_lockptr = lock;
 
 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);
@@ -38,15 +42,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);
@@ -54,12 +56,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;