[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.10-22-g5ab58d3

[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, STABLE-BRANCH-2-2 has been updated
       via  5ab58d3001b0342aecaf691b1af70b1f76426f55 (commit)
      from  8a33d5c9c699d2145d39b362d580df67571c5f36 (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 5ab58d3001b0342aecaf691b1af70b1f76426f55
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Nov 5 08:59:13 2018 +0100

    dirmngr: Fix LDAP port parsing.
    
    * dirmngr/misc.c (host_and_port_from_url): Fix bad port parsing and a
    segv for a missing slash after the host name.
    --
    
    Reportted-by: Tomas Mraz
    GnuPG-bug-id: 4230
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit a3a5a2451924640588e5ecc03a1d4ba6a6ba94a5)

diff --git a/dirmngr/misc.c b/dirmngr/misc.c
index 6291a9a..eef04ed 100644
--- a/dirmngr/misc.c
+++ b/dirmngr/misc.c
@@ -515,7 +515,7 @@ host_and_port_from_url (const char *url, int *port)
   if ((p = strchr (buf, '/')))
     *p++ = 0;
   strlwr (buf);
-  if ((p = strchr (p, ':')))
+  if ((p = strchr (buf, ':')))
     {
       *p++ = 0;
       *port = atoi (p);

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

Summary of changes:
 dirmngr/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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