]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: threads: fix pthread_mutex_unlock when !USE_THREAD
authorWilly Tarreau <w@1wt.eu>
Thu, 22 Jul 2021 12:42:32 +0000 (14:42 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 22 Jul 2021 12:43:21 +0000 (14:43 +0200)
Commit 048368ef6 ("MINOR: deinit: always deinit the init_mutex on
failed initialization") added the missing unlock but forgot to
condition it on USE_THREAD, resulting in a build failure. No
backport is needed.

This addresses oss-fuzz issue 36426.

src/haproxy.c

index 5d3d92869489e199db15805c74553d97e6c4c202..d09f15c85a243b2c42b416c2d9e69716f18c70ba 100644 (file)
@@ -2740,7 +2740,9 @@ static void *run_thread_poll_loop(void *data)
        list_for_each_entry(ptaf, &per_thread_alloc_list, list) {
                if (!ptaf->fct()) {
                        ha_alert("failed to allocate resources for thread %u.\n", tid);
+#ifdef USE_THREAD
                        pthread_mutex_unlock(&init_mutex);
+#endif
                        exit(1);
                }
        }
@@ -2752,7 +2754,9 @@ static void *run_thread_poll_loop(void *data)
        list_for_each_entry(ptif, &per_thread_init_list, list) {
                if (!ptif->fct()) {
                        ha_alert("failed to initialize thread %u.\n", tid);
+#ifdef USE_THREAD
                        pthread_mutex_unlock(&init_mutex);
+#endif
                        exit(1);
                }
        }