Repair multiple breakage in Windows-specific code for appending '.exe'.

diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
index 3ad9dbb1a28ecccb238a76396419348af566bd9c..7095ba62a8013a4d2f21ef4edfb615b784d53642 100644 (file)
--- a/contrib/pg_upgrade/exec.c
+++ b/contrib/pg_upgrade/exec.c
@@ -186,16 +186,10 @@ validate_exec(const char *dir, const char *cmdName)
        snprintf(path, sizeof(path), "%s/%s", dir, cmdName);
 
 #ifdef WIN32
-       /* Win32 requires a .exe suffix for stat() */
-       char            path_exe[MAXPGPATH + sizeof(EXE_EXT) - 1];
-
-       if (strlen(path) >= strlen(EXE_EXT) &&
+       /* Windows requires a .exe suffix for stat() */
+       if (strlen(path) <= strlen(EXE_EXT) ||
                pg_strcasecmp(path + strlen(path) - strlen(EXE_EXT), EXE_EXT) != 0)
-       {
-               strcpy(path_exe, path);
-               strcat(path_exe, EXE_EXT);
-               path = path_exe;
-       }
+               strlcat(path, EXE_EXT, sizeof(path));
 #endif
 
        /*