[git] GpgOL - branch, master, updated. gpgol-1.4.0-4-gc8cdb4c

[by Andre Heinecke]

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 "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  c8cdb4c9a9bb590b8785b483cf71657e20e0b92d (commit)
      from  643575f38f545456afc456e1045b914d3d06bbb8 (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 c8cdb4c9a9bb590b8785b483cf71657e20e0b92d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 11 15:59:57 2016 +0200

    Fix loop logic error in new server name detection
    
    * src/engine-assuan.c (get_uiserver_name): Fix name loop.

diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 32dbae8..c60713b 100644
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -353,7 +353,7 @@ get_uiserver_name (void)
                                  "gpa.exe",
                                  "bin\\gpa.exe",
                                  NULL};
-  const char *tmp = NULL;
+  const char **tmp = NULL;
 
   dir = get_gpg4win_dir ();
   if (!dir)
@@ -384,14 +384,14 @@ get_uiserver_name (void)
       return name;
     }
   /* Fallbacks */
-  for (tmp = *server_names; *tmp; tmp++)
+  for (tmp = server_names; *tmp; tmp++)
     {
       if (name)
         {
           xfree (name);
         }
-      name = xmalloc (strlen (dir) + strlen (tmp) + extra_arglen + 2);
-      strcpy (stpcpy (stpcpy (name, dir), "\\"), tmp);
+      name = xmalloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
+      strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
       for (p = name; *p; p++)
         if (*p == '/')
           *p = '\\';

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

Summary of changes:
 src/engine-assuan.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org