kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): don't try to get/set option for invalid option name (#31302)

Browse Source 
Problem:
`validate_option_value_args()` returns `OK` even if option name is
invalid or if option doesn't have the supported scope, which leads to
Neovim still trying to erroneously get/set the option in those cases,
which can lead to an assertion failure when `option_has_scope()` is
invoked. This issue miraculously doesn't exist in release builds since
the assertion is skipped and `(get/set)_option_value_for` returns if
there is an error set, but that is not the intended location for that
error to be caught.

Solution:
Make `validate_option_value_args()` return `FAIL` if there is an error
set, which causes the API option functions to return early instead of
trying to get/set an invalid option.
This commit is contained in:
Famiu Haque 2024-11-22 18:32:51 +06:00 committed by GitHub
parent c697c49a76
commit bff07f6dd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/api/options.c
View File

@ -95,7 +95,7 @@ static int validate_option_value_args(Dict(option) *opts, char *name, OptIndex *
} }
} }
return OK; return ERROR_SET(err) ? FAIL : OK;
#undef HAS_KEY_X #undef HAS_KEY_X
} }

5
test/functional/api/vim_spec.lua
View File

@ -1770,6 +1770,11 @@ describe('API', function()
end) end)
it('validation', function() it('validation', function()
eq("Unknown option 'foobar'", pcall_err(api.nvim_set_option_value, 'foobar', 'baz', {}))
eq(
"Unknown option 'foobar'",
pcall_err(api.nvim_set_option_value, 'foobar', 'baz', { win = api.nvim_get_current_win() })
)
eq( eq(
"Invalid 'scope': expected 'local' or 'global'", "Invalid 'scope': expected 'local' or 'global'",
pcall_err(api.nvim_get_option_value, 'scrolloff', { scope = 'bogus' }) pcall_err(api.nvim_get_option_value, 'scrolloff', { scope = 'bogus' })