mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-03 16:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test and initial fix for crash with dictwatcherdel

Browse Source 
Fixes https://github.com/neovim/neovim/issues/11188.
This commit is contained in:
Daniel Hahler
2019-10-09 19:40:50 +02:00
committed by Jan Edmund Lazo
parent c20ae3aadb
commit 4c76b1e981
3 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/nvim/eval/typval.c
View File

@@ -1109,6 +1109,7 @@ void tv_dict_watcher_add(dict_T *const dict, const char *const key_pattern,
watcher->key_pattern_len = key_pattern_len;
watcher->callback = callback;
watcher->busy = false;
watcher->needs_free = false;
QUEUE_INSERT_TAIL(&dict->watchers, &watcher->node);
}
@@ -1197,7 +1198,11 @@ bool tv_dict_watcher_remove(dict_T *const dict, const char *const key_pattern,
}
QUEUE_REMOVE(w);
tv_dict_watcher_free(watcher);
if (watcher->busy) {
watcher->needs_free = true;
} else {
tv_dict_watcher_free(watcher);
}
return true;
}
@@ -1268,6 +1273,9 @@ void tv_dict_watcher_notify(dict_T *const dict, const char *const key,
callback_call(&watcher->callback, 3, argv, &rettv);
watcher->busy = false;
tv_clear(&rettv);
if (watcher->needs_free) {
tv_dict_watcher_free(watcher);
}
}
}
tv_dict_unref(dict);