upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUILD: threads: fix pthread_mutex_unlock when !USE_THREAD

Browse source 
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.
This commit is contained in:
Willy Tarreau 2021-07-22 14:42:32 +02:00
parent acff309753
commit b3c4a8f59d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/haproxy.c
View 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);
}
}