From: Christian Brabandt <cb@256bit.org>
Date: Sat, 17 Aug 2024 13:52:11 +0000 (+0200)
Subject: runtime(dist): verify that executable is in $PATH
X-Git-Tag: v9.1.0680~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e25d91cb7bb4dc171cb4e95b1bb79a39400a13a;p=thirdparty%2Fvim.git

runtime(dist): verify that executable is in $PATH

Otherwise, if the executable to be verified does not exist,
this would cause a false-positive in the 'IsSafeExecutable()' check,
because 'exepath(executable)' returns an empty string and
'fnamemodify('', ':p:h')' returns the current directory and as a result
the 'IsSafeExecutable()' returns false (for the wrong reason).

Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/runtime/autoload/dist/vim.vim b/runtime/autoload/dist/vim.vim
index 021244c93b..d519406530 100644
--- a/runtime/autoload/dist/vim.vim
+++ b/runtime/autoload/dist/vim.vim
@@ -18,6 +18,10 @@ endif
 if !has('vim9script')
   function dist#vim#IsSafeExecutable(filetype, executable)
     let cwd = getcwd()
+    if empty(exepath(a:executable))
+      echomsg a:executable .. " not found in $PATH"
+      return v:false
+    endif
     return get(g:, a:filetype .. '_exec', get(g:, 'plugin_exec', 0)) &&
           \ (fnamemodify(exepath(a:executable), ':p:h') !=# cwd
           \ || (split($PATH, has('win32') ? ';' : ':')->index(cwd) != -1 &&
diff --git a/runtime/autoload/dist/vim9.vim b/runtime/autoload/dist/vim9.vim
index 807140da7c..8fa9380f57 100644
--- a/runtime/autoload/dist/vim9.vim
+++ b/runtime/autoload/dist/vim9.vim
@@ -6,6 +6,10 @@ vim9script
 # Last Change:	2023 Oct 25
 
 export def IsSafeExecutable(filetype: string, executable: string): bool
+    if empty(exepath(executable))
+      echomsg executable .. " not found in $PATH"
+      return v:false
+    endif
     var cwd = getcwd()
     return get(g:, filetype .. '_exec', get(g:, 'plugin_exec', 0))
       && (fnamemodify(exepath(executable), ':p:h') !=# cwd