[git] Assuan - branch, master, updated. libassuan-2.4.5-2-ga627350

[by NIIBE Yutaka]

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 "IPC library used by GnuPG".

The branch, master has been updated
       via  a627350eed5dc32bac41195462f27dee1987b0f5 (commit)
      from  c39244aa5802d7ec44134def94a5c919752b5491 (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 a627350eed5dc32bac41195462f27dee1987b0f5
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Dec 6 19:56:34 2017 +0900

    Use wrapped __assuan_usleep for _assuan_npth_usleep.
    
    * src/assuan.h.in (_assuan_npth_usleep): Wrap __assuan_usleep.
    
    --
    
    Assuan should support system hooks for nPth before npth_init.
    
    Before the call of npth_init, npth_unprotect and npth_protect do
    nothing, whiile npth_usleep may crash.
    
    No use of npth_usleep is better.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/src/assuan.h.in b/src/assuan.h.in
index f9eddca..9594e73 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -546,7 +546,9 @@ extern struct assuan_system_hooks _assuan_system_pth;
 
 #define ASSUAN_SYSTEM_NPTH_IMPL						\
   static void _assuan_npth_usleep (assuan_context_t ctx, unsigned int usec) \
-  { (void) ctx; npth_usleep (usec); }					\
+  { ssize_t res; (void) ctx; npth_unprotect();				\
+    res = __assuan_usleep (ctx, usec);					\
+    npth_protect(); }							\
   static ssize_t _assuan_npth_read (assuan_context_t ctx, assuan_fd_t fd, \
 				    void *buffer, size_t size)		\
   { ssize_t res; (void) ctx; npth_unprotect();				\

-----------------------------------------------------------------------

Summary of changes:
 src/assuan.h.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
IPC library used by GnuPG
http://git.gnupg.org