mirror of
https://github.com/neovim/neovim
synced 2025-07-16 01:01:49 +00:00
fix(treesitter): validate language name
Problem: Some injections (like markdown) allow specifying arbitrary language names for code blocks, which may be lead to errors when looking for a corresponding parser in runtime path. Solution: Validate that the language name only contains alphanumeric characters and `_` (e.g., for `c_sharp`) and error otherwise.
This commit is contained in:
@ -684,6 +684,7 @@ require_language({lang}, {path}, {silent}, {symbol_name})
|
||||
|
||||
Parameters: ~
|
||||
• {lang} (string) Language the parser should parse
|
||||
(alphanumerical and `_` only)
|
||||
• {path} (string|nil) Optional path the parser is located at
|
||||
• {silent} (boolean|nil) Don't throw an error if language not
|
||||
found
|
||||
|
@ -6,7 +6,7 @@ local M = {}
|
||||
---
|
||||
--- Parsers are searched in the `parser` runtime directory, or the provided {path}
|
||||
---
|
||||
---@param lang string Language the parser should parse
|
||||
---@param lang string Language the parser should parse (alphanumerical and `_` only)
|
||||
---@param path (string|nil) Optional path the parser is located at
|
||||
---@param silent (boolean|nil) Don't throw an error if language not found
|
||||
---@param symbol_name (string|nil) Internal symbol name for the language to load
|
||||
@ -16,13 +16,19 @@ function M.require_language(lang, path, silent, symbol_name)
|
||||
return true
|
||||
end
|
||||
if path == nil then
|
||||
local fname = 'parser/' .. vim.fn.fnameescape(lang) .. '.*'
|
||||
if not (lang and lang:match('[%w_]+') == lang) then
|
||||
if silent then
|
||||
return false
|
||||
end
|
||||
error("'" .. lang .. "' is not a valid language name")
|
||||
end
|
||||
|
||||
local fname = 'parser/' .. lang .. '.*'
|
||||
local paths = a.nvim_get_runtime_file(fname, false)
|
||||
if #paths == 0 then
|
||||
if silent then
|
||||
return false
|
||||
end
|
||||
|
||||
error("no parser for '" .. lang .. "' language, see :help treesitter-parsers")
|
||||
end
|
||||
path = paths[1]
|
||||
|
@ -31,6 +31,11 @@ describe('treesitter language API', function()
|
||||
pcall_err(exec_lua, 'vim.treesitter.require_language("c", nil, false, "borklang")'))
|
||||
end)
|
||||
|
||||
it('shows error for invalid language name', function()
|
||||
eq(".../language.lua:0: '/foo/' is not a valid language name",
|
||||
pcall_err(exec_lua, 'vim.treesitter.require_language("/foo/", nil, false)'))
|
||||
end)
|
||||
|
||||
it('inspects language', function()
|
||||
local keys, fields, symbols = unpack(exec_lua([[
|
||||
local lang = vim.treesitter.inspect_language('c')
|
||||
|
Reference in New Issue
Block a user