patch 8.1.0427: MS-Windows GUI: using invalid encoded file name
Problem: MS-Windows GUI: using invalid encoded file name.
Solution: Drop the file name and return NULL. (Ken Takata, closes #3467)
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 8574b63..35c1790 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -3627,7 +3627,7 @@
WCHAR *extp = NULL;
WCHAR *initdirp = NULL;
WCHAR *filterp;
- char_u *p;
+ char_u *p, *q;
if (dflt == NULL)
fileBuf[0] = NUL;
@@ -3713,16 +3713,16 @@
/* Convert from UCS2 to 'encoding'. */
p = utf16_to_enc(fileBuf, NULL);
- if (p != NULL)
- /* when out of memory we get garbage for non-ASCII chars */
- STRCPY(fileBuf, p);
- vim_free(p);
+ if (p == NULL)
+ return NULL;
/* Give focus back to main window (when using MDI). */
SetFocus(s_hwnd);
/* Shorten the file name if possible */
- return vim_strsave(shorten_fname1((char_u *)fileBuf));
+ q = vim_strsave(shorten_fname1(p));
+ vim_free(p);
+ return q;
}
# endif /* FEAT_MBYTE */