From: Ondřej Surý Date: Tue, 9 Aug 2016 09:03:16 +0000 (+0200) Subject: Fix segmentation fault in early shutdown from `quit()` in config X-Git-Tag: v1.1.0~6^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0589e90c6b8c0dfa6c69cdcfbfb0269cc039232;p=thirdparty%2Fknot-resolver.git Fix segmentation fault in early shutdown from `quit()` in config --- diff --git a/daemon/engine.c b/daemon/engine.c index 4f7a69f5c..ad852ba60 100644 --- a/daemon/engine.c +++ b/daemon/engine.c @@ -725,8 +725,13 @@ int engine_start(struct engine *engine, const char *config_path) void engine_stop(struct engine *engine) { - uv_timer_stop(engine->updater); - uv_close((uv_handle_t *)engine->updater, (uv_close_cb) free); + if (!engine) { + return; + } + if (engine->updater) { + uv_timer_stop(engine->updater); + uv_close((uv_handle_t *)engine->updater, (uv_close_cb) free); + } uv_stop(uv_default_loop()); }