agent: Fix error code check from npth_mutex_init.
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 10 Sep 2018 00:16:50 +0000 (09:16 +0900)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 8 Oct 2018 15:36:01 +0000 (16:36 +0100)
* 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 <gniibe@fsij.org>
(cherry picked from commit 213379debe5591dad6339aa95aa7282e0de620f9)

Gbp-Pq: Name agent-Fix-error-code-check-from-npth_mutex_init.patch

agent/call-pinentry.c

index a0886814f640b1697d74f8b883f8c641d268d80b..b68d0a8c92a0cd218e008d141a55f716fd0ad2a2 100644 (file)
@@ -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;
     }
 }