[git] GnuPG - branch, master, updated. gnupg-2.1.18-47-gf518196

[by Werner Koch]

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, master has been updated
       via  f518196ca6202ae97a1e8494afe25e5fbb0e9d47 (commit)
      from  8ddc9268f6aedef0e178b174b89245c33d8189dd (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 f518196ca6202ae97a1e8494afe25e5fbb0e9d47
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Feb 1 08:18:44 2017 +0100

    Fix explanation of commit e175152ef7515921635bf1e00383e812668d13fc.
    
    --

diff --git a/agent/cache.c b/agent/cache.c
index 4cb158c..41e0905 100644
--- a/agent/cache.c
+++ b/agent/cache.c
@@ -485,10 +485,12 @@ agent_store_cache_hit (const char *key)
    *
    * Background: xtrystrdup uses gcry_strdup which may use the secure
    * memory allocator of Libgcrypt.  That allocator takes locks and
-   * since version 1.14 libgpg-error is nPth aware and thus talking a
+   * since version 1.14 libgpg-error is nPth aware and thus taking a
    * lock may now lead to thread switch.  Note that this only happens
-   * when secure memory is allocated, the standard allocator uses
-   * malloc which is not nPth aware.
+   * when secure memory is _allocated_ (the standard allocator uses
+   * malloc which is not nPth aware) but not when calling _xfree_
+   * because gcry_free needs to check whether the pointer is in secure
+   * memory and thus needs to take a lock.
    */
   new = key ? xtrystrdup (key) : NULL;
 
diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c
index ad19fc2..615c9e6 100644
--- a/dirmngr/dns-stuff.c
+++ b/dirmngr/dns-stuff.c
@@ -1227,7 +1227,7 @@ is_ip_address (const char *name)
       if (*s == '.')
         {
           if (s[1] == '.')
-            return 0; /* No:  Douple dot. */
+            return 0; /* No:  Double dot. */
           if (atoi (s+1) > 255)
             return 0; /* No:  Ipv4 byte value too large.  */
           ndots++;

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

Summary of changes:
 agent/cache.c       | 8 +++++---
 dirmngr/dns-stuff.c | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org