fix(NVIM_APPNAME): show error message if $NVIM_APPNAME is invalid

Closes https://github.com/neovim/neovim/issues/23056.
This commit is contained in:
Ghjuvan Lacambre 2023-05-28 16:04:54 +02:00 committed by GitHub
parent d561830a52
commit 5a3752889c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 0 deletions

View File

@ -250,6 +250,11 @@ int main(int argc, char **argv)
argv0 = argv[0];
if (!appname_is_valid()) {
os_errmsg("$NVIM_APPNAME is not a valid file name.\n");
exit(1);
}
if (argc > 1 && STRICMP(argv[1], "-ll") == 0) {
if (argc == 2) {
print_mainerr(err_arg_missing, argv[1]);

View File

@ -69,6 +69,19 @@ const char *get_appname(void)
return env_val;
}
/// Ensure that APPNAME is valid. In particular, it cannot contain directory separators.
bool appname_is_valid(void)
{
const char *appname = get_appname();
const size_t appname_len = strlen(appname);
for (size_t i = 0; i < appname_len; i++) {
if (appname[i] == PATHSEP) {
return false;
}
}
return true;
}
/// Return XDG variable value
///
/// @param[in] idx XDG variable to use.

View File

@ -14,6 +14,7 @@ local ok = helpers.ok
local funcs = helpers.funcs
local insert = helpers.insert
local neq = helpers.neq
local nvim_prog = helpers.nvim_prog
local mkdir = helpers.mkdir
local rmdir = helpers.rmdir
local alter_slashes = helpers.alter_slashes
@ -603,6 +604,10 @@ describe('stdpath()', function()
eq(appname, funcs.fnamemodify(funcs.stdpath('data_dirs')[1], ':t'))
end
assert_alive() -- Check for crash. #8393
-- Check that nvim rejects invalid APPNAMEs
local child = funcs.jobstart({ nvim_prog }, {env={NVIM_APPNAME='a/b\\c'}})
eq(1, funcs.jobwait({child}, 3000)[1])
end)
context('returns a String', function()