[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.10-4-g213379d
by NIIBE Yutaka
cvs at cvs.gnupg.org
Mon Sep 10 02:23:33 CEST 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, STABLE-BRANCH-2-2 has been updated
via 213379debe5591dad6339aa95aa7282e0de620f9 (commit)
from 91f8a9b33a1282cbf00cb4b71b177088f0d923d7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 213379debe5591dad6339aa95aa7282e0de620f9
Author: NIIBE Yutaka <gniibe at fsij.org>
Date: Mon Sep 10 09:16:50 2018 +0900
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 <gniibe at fsij.org>
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index a088681..b68d0a8 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;
}
}
-----------------------------------------------------------------------
Summary of changes:
agent/call-pinentry.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list