patch 8.1.0589: compilation error in gvimext.cpp

Problem:    Compilation error in gvimext.cpp.
Solution:   Return a value.  Also fix using uninitialized variable.

diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp
index 62d925b8a222a85e8a0bb3d2732dd7184257843b..30b2dddb67c095efd7ec23fce12adf93d1d00fb7 100644 (file)
--- a/src/GvimExt/gvimext.cpp
+++ b/src/GvimExt/gvimext.cpp
@@ -1025,7 +1025,7 @@ STDMETHODIMP CShellExt::InvokeSingleGvim(HWND hParent,
     cmdlen = BUFSIZE;
     cmdStrW  = (wchar_t *) malloc(cmdlen * sizeof(wchar_t));
     if (cmdStrW == NULL)
-       return;
+       return E_FAIL;
     getGvimInvocationW(cmdStrW);
 
     if (useDiff)
@@ -1043,7 +1043,10 @@ STDMETHODIMP CShellExt::InvokeSingleGvim(HWND hParent,
            cmdlen = len + BUFSIZE;
            wchar_t *cmdStrW_new = (wchar_t *)realloc(cmdStrW, cmdlen * sizeof(wchar_t));
            if (cmdStrW_new == NULL)
-               goto theend;
+           {
+               free(cmdStrW);
+               return E_FAIL;
+           }
            cmdStrW = cmdStrW_new;
        }
        wcscat(cmdStrW, L" \"");

diff --git a/src/dosinst.c b/src/dosinst.c
index f73576fdadd58cf624e9e38c6842985545a3df47..9ecb0f4eb1a406803238190d573c13a1aa7964a1 100644 (file)
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -2459,7 +2459,7 @@ command_line_setup_choices(int argc, char **argv)
        }
        else if (strcmp(argv[i], "-create-directories") == 0)
        {
-           int vimfiles_dir_choice;
+           int vimfiles_dir_choice = (int)vimfiles_dir_none;
 
            init_directories_choice();
            if (argv[i + 1][0] != '-')

diff --git a/src/version.c b/src/version.c
index 3c9eb0d8849ac0137e81a6e26deca26b1802e6f0..f868e6abf97439020611f847e66300f34fcaa036 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    589,
 /**/
     588,
 /**/