fix(manpages): safety for malformed entries (closes #1208)

ibhagwan · May 20, 2024 · 6573114 · 6573114
1 parent e53867b
commit 6573114
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lua/fzf-lua/actions.lua b/lua/fzf-lua/actions.lua
@@ -91,9 +91,8 @@ M.resume = function(_, _)
 end
 
 M.vimcmd = function(vimcmd, selected, noesc)
-  for i = 1, #selected do
-    vim.cmd(("%s %s"):format(vimcmd,
-      noesc and selected[i] or vim.fn.fnameescape(selected[i])))
+  for _, sel in ipairs(selected) do
+    vim.cmd(("%s %s"):format(vimcmd, noesc and sel or vim.fn.fnameescape(sel)))
   end
 end
 

diff --git a/lua/fzf-lua/libuv.lua b/lua/fzf-lua/libuv.lua
@@ -648,7 +648,7 @@ M.shellescape = function(s, win_style)
   else
     local ret = nil
     vim.o.shell = "sh"
-    if not s:match([["]]) and not s:match([[\]]) then
+    if s and not s:match([["]]) and not s:match([[\]]) then
       -- if the original string does not contain double quotes,
       -- replace surrounding single quote with double quotes,
       -- temporarily replace all single quotes with double

diff --git a/lua/fzf-lua/providers/manpages.lua b/lua/fzf-lua/providers/manpages.lua
@@ -16,7 +16,8 @@ end
 --- @param apropos_line string
 --- @return string arg without shellescape
 M.manpage_vim_arg = function(apropos_line)
-  return string.format("%s(%s)", parse_apropos(apropos_line))
+  local page, section = parse_apropos(apropos_line)
+  return string.format("%s(%s)", page, section)
 end
 --- @param apropos_line string
 --- @return string arg with shellescape