[git] GpgEX - branch, master, updated. gpgex-1.0.4-4-g3dddfb2

[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 the Windows Explorer".

The branch, master has been updated
       via  3dddfb2546b839e104286767f504e456ae91df45 (commit)
      from  5c19ffe9d71d6e6763d6e47a67f1ca0a1651e39f (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 3dddfb2546b839e104286767f504e456ae91df45
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Aug 11 15:45:49 2016 +0200

    Fix loop logic error in new server name detection
    
    * src/client.cc (default_uiserver_cmdline): Iterate over server_names
    array and not over the first server name itself.

diff --git a/src/client.cc b/src/client.cc
index 6f27175..ccfa0ac 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -108,7 +108,7 @@ default_uiserver_cmdline (void)
     }
 #else /*!ENABLE_GPA_ONLY*/
     {
-      const char *dir, *tmp;
+      const char *dir, **tmp;
       char *uiserver, *p;
       int extra_arglen = 9;
       const char * server_names[] = {"kleopatra.exe",
@@ -163,16 +163,16 @@ default_uiserver_cmdline (void)
           return name;
         }
       /* Fallbacks */
-      for (tmp = *server_names; *tmp; tmp++)
+      for (tmp = server_names; *tmp; tmp++)
         {
           if (name)
             {
               free (name);
             }
-          name = (char*) malloc (strlen (dir) + strlen (tmp) + extra_arglen + 2);
+          name = (char*) malloc (strlen (dir) + strlen (*tmp) + extra_arglen + 2);
           if (!name)
             return NULL;
-          strcpy (stpcpy (stpcpy (name, dir), "\\"), tmp);
+          strcpy (stpcpy (stpcpy (name, dir), "\\"), *tmp);
           for (p = name; *p; p++)
             if (*p == '/')
               *p = '\\';

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

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


hooks/post-receive
-- 
GnupG extension for the Windows Explorer
http://git.gnupg.org