IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5935 from jamessan/dictwatcher-crash

Browse Source 
eval: Remove dictwatcher from watchers queue before freeing it
This commit is contained in:
James McCoy 2017-01-12 18:24:19 -05:00 committed by GitHub
commit 802b49ee80
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval.c
View File

@ -6410,8 +6410,8 @@ static void dict_free_contents(dict_T *d) {
while (!QUEUE_EMPTY(&d->watchers)) { while (!QUEUE_EMPTY(&d->watchers)) {
QUEUE *w = QUEUE_HEAD(&d->watchers); QUEUE *w = QUEUE_HEAD(&d->watchers);
DictWatcher *watcher = dictwatcher_node_data(w); DictWatcher *watcher = dictwatcher_node_data(w);
dictwatcher_free(watcher);
QUEUE_REMOVE(w); QUEUE_REMOVE(w);
dictwatcher_free(watcher);
} }
hash_clear(&d->dv_hashtab); hash_clear(&d->dv_hashtab);

17
test/functional/ex_cmds/dict_notifications_spec.lua
View File

@ -3,6 +3,7 @@ local clear, nvim, source = helpers.clear, helpers.nvim, helpers.source
local eq, next_msg = helpers.eq, helpers.next_message local eq, next_msg = helpers.eq, helpers.next_message
local exc_exec = helpers.exc_exec local exc_exec = helpers.exc_exec
local command = helpers.command local command = helpers.command
local eval = helpers.eval
describe('dictionary change notifications', function() describe('dictionary change notifications', function()
@ -255,5 +256,21 @@ describe('dictionary change notifications', function()
eq({'notification', '2b', {'key', {old = 'v2', new = 'value'}}}, next_msg()) eq({'notification', '2b', {'key', {old = 'v2', new = 'value'}}}, next_msg())
end) end)
it('does not crash when freeing a watched dictionary', function()
source([[
function! Watcher(dict, key, value)
echo a:key string(a:value)
endfunction
function! MakeWatch()
let d = {'foo': 'bar'}
call dictwatcheradd(d, 'foo', function('Watcher'))
endfunction
]])
command('call MakeWatch()')
eq(2, eval('1+1')) -- Still alive?
end)
end) end)
end) end)