From 62557fd2a0cf5c749a8262949200019f4bbe8763 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Wed, 8 Feb 2017 23:06:57 +0100 Subject: ipcpd: Add cleanup handler to gam --- src/ipcpd/normal/gam.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ipcpd/normal/gam.c b/src/ipcpd/normal/gam.c index fae34dfe..36025f85 100644 --- a/src/ipcpd/normal/gam.c +++ b/src/ipcpd/normal/gam.c @@ -283,6 +283,9 @@ int gam_flow_wait(struct gam * instance, pthread_mutex_lock(&instance->gas_lock); + pthread_cleanup_push((void(*)(void *))pthread_mutex_unlock, + (void *) &instance->gas_lock); + while (list_is_empty(&instance->gas)) pthread_cond_wait(&instance->gas_cond, &instance->gas_lock); @@ -299,7 +302,7 @@ int gam_flow_wait(struct gam * instance, list_del(&ga->next); free(ga); - pthread_mutex_unlock(&instance->gas_lock); + pthread_cleanup_pop(true); return 0; } -- cgit v1.2.3