From 5f0c76b243aca8d5fcab15c24bf2b0ba33852155 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Fri, 25 Mar 2016 14:17:10 -0400 Subject: vim-patch:7.4.1641 Problem: Using unterminated string. Solution: Add NUL before calling vim_strsave_shellescape(). (James McCoy) https://github.com/vim/vim/commit/5ca84ce4aa2832041f843e624c222bbc1f4d3e14 --- src/nvim/eval.c | 2 ++ src/nvim/version.c | 1 + test/functional/legacy/105_filename_modifiers_spec.lua | 2 ++ 3 files changed, 5 insertions(+) diff --git a/src/nvim/eval.c b/src/nvim/eval.c index f71620a7b4..3856edbef9 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -21993,6 +21993,8 @@ repeat: } if (src[*usedlen] == ':' && src[*usedlen + 1] == 'S') { + // vim_strsave_shellescape() needs a NUL terminated string. + (*fnamep)[*fnamelen] = NUL; p = vim_strsave_shellescape(*fnamep, false, false); xfree(*bufp); *bufp = *fnamep = p; diff --git a/src/nvim/version.c b/src/nvim/version.c index 98abb30b00..b7e5f1f2ef 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -69,6 +69,7 @@ static char *features[] = { // clang-format off static int included_patches[] = { + 1641, 1574, 1570, 1511, diff --git a/test/functional/legacy/105_filename_modifiers_spec.lua b/test/functional/legacy/105_filename_modifiers_spec.lua index 3413667022..5ce2024889 100644 --- a/test/functional/legacy/105_filename_modifiers_spec.lua +++ b/test/functional/legacy/105_filename_modifiers_spec.lua @@ -43,6 +43,7 @@ describe('filename modifiers', function() execute([=[Put fnamemodify('abc'' ''def', ':S' )]=]) execute([=[Put fnamemodify('abc''%''def', ':S' )]=]) execute([=[Put fnamemodify("abc\ndef", ':S' )]=]) + execute([=[Put expand('%:r:S') == shellescape(expand('%:r'))]=]) execute([=[set shell=tcsh]=]) execute([=[Put fnamemodify("abc\ndef", ':S' )]=]) execute([=[1 delete _]=]) @@ -76,6 +77,7 @@ describe('filename modifiers', function() fnamemodify('abc'' ''def', ':S' ) '''abc''\'''' ''\''''def''' fnamemodify('abc''%''def', ':S' ) '''abc''\''''%''\''''def''' fnamemodify("abc\ndef", ':S' ) '''abc^@def''' + expand('%:r:S') == shellescape(expand('%:r')) 1 fnamemodify("abc\ndef", ':S' ) '''abc\^@def''']=]) end) end) -- cgit