From 74b9f33a95b57eeafbec39796c72c3be48b83f78 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Mon, 3 Nov 2014 15:31:41 -0300 Subject: event: Do an early return from event_teardown when not initialized --- src/nvim/os/event.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/os/event.c b/src/nvim/os/event.c index ecaec0b9ce..bfb8a625ef 100644 --- a/src/nvim/os/event.c +++ b/src/nvim/os/event.c @@ -39,7 +39,7 @@ typedef struct { // immediate_events: Events that should be processed after exiting libuv event // loop(to avoid recursion), but before returning from // `event_poll` -static klist_t(Event) *deferred_events, *immediate_events; +static klist_t(Event) *deferred_events = NULL, *immediate_events = NULL; void event_init(void) { @@ -68,6 +68,11 @@ void event_init(void) void event_teardown(void) { + if (!deferred_events) { + // Not initialized(possibly a --version invocation) + return; + } + channel_teardown(); job_teardown(); server_teardown(); -- cgit