Mercurial > vim
changeset 22588:050cff1294ab v8.2.1842
patch 8.2.1842: crash when USE_FNAME_CASE is defined and using :browse
Commit: https://github.com/vim/vim/commit/21cbe175eece17fad21d7403b00422445b587138
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Oct 13 19:08:24 2020 +0200
patch 8.2.1842: crash when USE_FNAME_CASE is defined and using :browse
Problem: Crash when USE_FNAME_CASE is defined and using :browse.
Solution: Don't use read-only memory for ".". (Yegappan Lakshmanan,
closes #7123)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 13 Oct 2020 19:15:04 +0200 |
| parents | 1e0d1c677ae1 |
| children | 97f5ed911b24 |
| files | src/ex_cmds.c src/ex_docmd.c src/testdir/test_edit.vim src/version.c |
| diffstat | 4 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2465,6 +2465,7 @@ do_ecmd( bufref_T old_curbuf; char_u *free_fname = NULL; #ifdef FEAT_BROWSE + char_u dot_path[] = "."; char_u *browse_file = NULL; #endif int retval = FAIL; @@ -2511,7 +2512,7 @@ do_ecmd( // No browsing supported but we do have the file explorer: // Edit the directory. if (ffname == NULL || !mch_isdir(ffname)) - ffname = (char_u *)"."; + ffname = dot_path; } else {
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -6084,6 +6084,7 @@ ex_splitview(exarg_T *eap) char_u *fname = NULL; #endif #ifdef FEAT_BROWSE + char_u dot_path[] = "."; int browse_flag = cmdmod.browse; #endif int use_tab = eap->cmdidx == CMD_tabedit @@ -6136,7 +6137,7 @@ ex_splitview(exarg_T *eap) // No browsing supported but we do have the file explorer: // Edit the directory. if (*eap->arg == NUL || !mch_isdir(eap->arg)) - eap->arg = (char_u *)"."; + eap->arg = dot_path; } else {
--- a/src/testdir/test_edit.vim +++ b/src/testdir/test_edit.vim @@ -1805,4 +1805,22 @@ func Test_edit_lastline_scroll() close! endfunc +func Test_edit_browse() + " in the GUI this opens a file picker, we only test the terminal behavior + CheckNotGui + + " ":browse xxx" checks for the FileExplorer augroup and assumes editing "." + " works then. + augroup FileExplorer + au! + augroup END + + " When the USE_FNAME_CASE is defined this used to cause a crash. + browse enew + bwipe! + + browse split + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab