From f518196ca6202ae97a1e8494afe25e5fbb0e9d47 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 1 Feb 2017 08:18:44 +0100 Subject: [PATCH] Fix explanation of commit e175152ef7515921635bf1e00383e812668d13fc. -- --- agent/cache.c | 8 +++++--- dirmngr/dns-stuff.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/agent/cache.c b/agent/cache.c index 4cb158c62..41e0905b0 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 ad19fc2ce..615c9e6c9 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++;