From 1524ba9656f0205d8c6ef504f773b832a7a12ab9 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 6 Dec 2017 11:20:51 +0900 Subject: [PATCH] agent: Set assuan system hooks before call of assuan_sock_init. * agent/gpg-agent.c (initialize_modules): Move assuan_set_system_hooks. (main): ... here, just before assuan_sock_init. -- In Assuan, global variable SOCK_CTX is used internally, which is initialized by assuan_sock_init. When initialized, system hooks are copied into SOCK_CTX structure. Thus, system hooks should be set, before the call of assuan_sock_init. GnuPG-bug-id: 3378 Signed-off-by: NIIBE Yutaka --- agent/gpg-agent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 1696e4ecd..b076ca3b8 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -966,7 +966,6 @@ static void initialize_modules (void) { thread_init_once (); - assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH); initialize_module_cache (); initialize_module_call_pinentry (); initialize_module_call_scd (); @@ -1027,6 +1026,7 @@ main (int argc, char **argv ) malloc_hooks.free = gcry_free; assuan_set_malloc_hooks (&malloc_hooks); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); + assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH); assuan_sock_init (); setup_libassuan_logging (&opt.debug, NULL);