GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 17:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(context): don't leak memory on multiple invalid objects (#25979)

Browse Source
This commit is contained in:
zeertzjq
2023-11-11 13:10:26 +08:00
committed by GitHub
parent e9b9a86cd5
commit fdaf6bc557
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/context.c
View File

@ -380,7 +380,7 @@ int ctx_from_dict(Dictionary dict, Context *ctx, Error *err)
assert(ctx != NULL); assert(ctx != NULL);
int types = 0; int types = 0;
for (size_t i = 0; i < dict.size; i++) { for (size_t i = 0; i < dict.size && !ERROR_SET(err); i++) {
KeyValuePair item = dict.items[i]; KeyValuePair item = dict.items[i];
if (item.value.type != kObjectTypeArray) { if (item.value.type != kObjectTypeArray) {
continue; continue;

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

@ -1982,7 +1982,7 @@ describe('API', function()
it('errors when context dictionary is invalid', function() it('errors when context dictionary is invalid', function()
eq('E474: Failed to convert list to msgpack string buffer', eq('E474: Failed to convert list to msgpack string buffer',
pcall_err(nvim, 'load_context', { regs = { {} } })) pcall_err(nvim, 'load_context', { regs = { {} }, jumps = { {} } }))
eq("Empty dictionary keys aren't allowed", eq("Empty dictionary keys aren't allowed",
pcall_err(nvim, 'load_context', { regs = { { [''] = '' } } })) pcall_err(nvim, 'load_context', { regs = { { [''] = '' } } }))
end) end)

2
test/functional/vimscript/ctx_functions_spec.lua
View File

@ -378,7 +378,7 @@ describe('context functions', function()
it('errors when context dictionary is invalid', function() it('errors when context dictionary is invalid', function()
call('ctxpush') call('ctxpush')
eq('Vim:E474: Failed to convert list to msgpack string buffer', eq('Vim:E474: Failed to convert list to msgpack string buffer',
pcall_err(call, 'ctxset', { regs = { {} } })) pcall_err(call, 'ctxset', { regs = { {} }, jumps = { {} } }))
end) end)
it('sets context dictionary at index in context stack', function() it('sets context dictionary at index in context stack', function()