0
0
mirror of https://github.com/vim/vim.git synced 2025-10-21 08:24:06 -04:00

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)
This commit is contained in:
Bram Moolenaar
2018-09-22 14:39:15 +02:00
parent 4841a7ccae
commit 7ff8a3cfb6
2 changed files with 8 additions and 6 deletions

View File

@@ -3627,7 +3627,7 @@ gui_mch_browseW(
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 @@ gui_mch_browseW(
/* 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 */

View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
427,
/**/
426,
/**/