summaryrefslogtreecommitdiff
path: root/libdaemon
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2019-11-08 13:10:49 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2019-11-11 22:44:25 +0100
commit1cc13335998558b84750fc2ba25c8b9f7b053746 (patch)
tree0242a418107dd7dd1b7632ea2470267c692e159d /libdaemon
parentcc865749ae443cca276ac411f302fd8989a843ef (diff)
downloadlvm2-1cc13335998558b84750fc2ba25c8b9f7b053746.tar.gz
daemons: check for non-zero thread_id
Do not call pthread_join if thread_id would be 0.
Diffstat (limited to 'libdaemon')
-rw-r--r--libdaemon/server/daemon-server.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index b45c0e51b..66e43d4a2 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -551,7 +551,8 @@ static void _reap(daemon_state s, int waiting)
while (ts) {
if (waiting || !ts->active) {
- if ((errno = pthread_join(ts->client.thread_id, &rv)))
+ if (ts->client.thread_id &&
+ (errno = pthread_join(ts->client.thread_id, &rv)))
ERROR(&s, "pthread_join failed: %s", strerror(errno));
last->next = ts->next;
free(ts);