diff --git a/runtime/pack/dist/opt/netrw/autoload/netrw.vim b/runtime/pack/dist/opt/netrw/autoload/netrw.vim index 33d0c5e877..02efbc5d24 100644 --- a/runtime/pack/dist/opt/netrw/autoload/netrw.vim +++ b/runtime/pack/dist/opt/netrw/autoload/netrw.vim @@ -1,7 +1,7 @@ " Creator: Charles E Campbell " Previous Maintainer: Luca Saccarola " Maintainer: This runtime file is looking for a new maintainer. -" Last Change: 2026 Jun 10 +" Last Change: 2026 Jun 16 " Copyright: Copyright (C) 2016 Charles E. Campbell {{{1 " Permission is hereby granted to use and distribute this code, " with or without modifications, provided that this copyright @@ -3083,7 +3083,7 @@ function s:NetrwBrowse(islocal,dirname) elseif !a:islocal && dirname !~ '[\/]$' && dirname !~ '^"' " s:NetrwBrowse : remote regular file handler {{{3 if bufname(dirname) != "" - exe "NetrwKeepj b ".bufname(dirname) + exe "NetrwKeepj b ".fnameescape(bufname(dirname)) else " attempt transfer of remote regular file @@ -8804,7 +8804,7 @@ function s:NetrwLocalRmFile(path, fname, all) call netrw#msg#Notify('ERROR', printf("unable to delete <%s>!", rmfile)) else " Remove file only if there are no pending changes - execute printf('silent! bwipeout %s', rmfile) + execute printf('silent! bwipeout %s', fnameescape(rmfile)) endif elseif dir && (all || empty(ok)) diff --git a/test/old/testdir/test_plugin_netrw.vim b/test/old/testdir/test_plugin_netrw.vim index ee15ad33cc..e847f8af90 100644 --- a/test/old/testdir/test_plugin_netrw.vim +++ b/test/old/testdir/test_plugin_netrw.vim @@ -856,4 +856,24 @@ func Test_netrw_injection() endtry endfunc +" Deleting a file whose name contains an Ex command separator must not let the +" name inject commands into the :execute in s:NetrwLocalRmFile(). +func Test_netrw_local_rm_injection() + CheckUnix + let dir = getcwd() . '/Xnetrwrm' + let fname = "x|let g:injected = 1" + call mkdir(dir, 'pR') + call writefile([], dir . '/' . fname) + try + call netrw#Call('NetrwLocalRmFile', dir, fname, 1) + call assert_false(exists('g:injected'), 'filename must not inject Ex commands') + " The file is removed before the sink, so its absence also confirms the + " vulnerable code path was actually exercised (not skipped on an error). + call assert_false(filereadable(dir . '/' . fname), 'crafted file must be deleted') + finally + call delete(dir . '/' . fname) + unlet! g:injected + endtry +endfunc + " vim:ts=8 sts=2 sw=2 et