Mercurial > vim
changeset 16180:1eaaa82ececf v8.1.1095
patch 8.1.1095: MS-Windows: executable() fails on very long filename
commit https://github.com/vim/vim/commit/8662189736e6cefb3fe852728adb5341f83973cf
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Mar 30 21:51:28 2019 +0100
patch 8.1.1095: MS-Windows: executable() fails on very long filename
Problem: MS-Windows: executable() fails on very long filename.
Solution: (Ken Takata, closes https://github.com/vim/vim/issues/4015)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 30 Mar 2019 22:00:04 +0100 |
| parents | 3dbabe1dc0b4 |
| children | 79e3a7f59365 |
| files | src/os_win32.c src/testdir/test_functions.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_win32.c +++ b/src/os_win32.c @@ -3299,14 +3299,17 @@ mch_writable(char_u *name) int mch_can_exe(char_u *name, char_u **path, int use_path) { - char_u buf[_MAX_PATH]; + // WinNT and later can use _MAX_PATH wide characters for a pathname, which + // means that the maximum pathname is _MAX_PATH * 3 bytes when 'enc' is + // UTF-8. + char_u buf[_MAX_PATH * 3]; int len = (int)STRLEN(name); char_u *p, *saved; - if (len >= _MAX_PATH) /* safety check */ + if (len >= sizeof(buf)) // safety check return FALSE; - /* Ty using the name directly when a Unix-shell like 'shell'. */ + // Try using the name directly when a Unix-shell like 'shell'. if (strstr((char *)gettail(p_sh), "sh") != NULL) if (executable_exists((char *)name, path, use_path)) return TRUE; @@ -3339,7 +3342,7 @@ mch_can_exe(char_u *name, char_u **path, } vim_free(saved); - vim_strncpy(buf, name, _MAX_PATH - 1); + vim_strncpy(buf, name, sizeof(buf) - 1); p = mch_getenv("PATHEXT"); if (p == NULL) p = (char_u *)".com;.exe;.bat;.cmd"; @@ -3354,7 +3357,7 @@ mch_can_exe(char_u *name, char_u **path, ++p; } else - copy_option_part(&p, buf + len, _MAX_PATH - len, ";"); + copy_option_part(&p, buf + len, sizeof(buf) - len, ";"); if (executable_exists((char *)buf, path, use_path)) return TRUE; }
--- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -944,6 +944,17 @@ func Test_Executable() endif endfunc +func Test_executable_longname() + if !has('win32') + return + endif + + let fname = 'X' . repeat('あ', 200) . '.bat' + call writefile([], fname) + call assert_equal(1, executable(fname)) + call delete(fname) +endfunc + func Test_hostname() let hostname_vim = hostname() if has('unix')