From 213379debe5591dad6339aa95aa7282e0de620f9 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 10 Sep 2018 09:16:50 +0900 Subject: [PATCH] agent: Fix error code check from npth_mutex_init. * agent/call-pinentry.c (initialize_module_call_pinentry): It's an error when npth_mutex_init returns non-zero. -- Cherry-pick from master commit of: adce73b86fd49d5bbb8884231a26cc7533d400e2 Actually, initialize_module_call_pinentry is only called once from main. So, this bug had no harm and having the static variable INITIALIZED is not needed. Signed-off-by: NIIBE Yutaka --- agent/call-pinentry.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c index a0886814f..b68d0a8c9 100644 --- a/agent/call-pinentry.c +++ b/agent/call-pinentry.c @@ -98,11 +98,15 @@ void initialize_module_call_pinentry (void) { static int initialized; + int err; if (!initialized) { - if (npth_mutex_init (&entry_lock, NULL)) - initialized = 1; + err = npth_mutex_init (&entry_lock, NULL); + if (err) + log_fatal ("error initializing mutex: %s\n", strerror (err)); + + initialized = 1; } }