From c5412a0eea9b2a40a80dadb902c5b3e45809326b Mon Sep 17 00:00:00 2001 From: YoungJun Cho Date: Mon, 28 Nov 2016 16:19:57 +0900 Subject: [PATCH] tdm_server: clean up tdm_server_init() This patch cleans up tdm_server_init() not to dereference when private_loop is NULL. Change-Id: I846c47130992264ff39d194e7ca4299e4970bc2c Signed-off-by: YoungJun Cho --- src/tdm_server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tdm_server.c b/src/tdm_server.c index 4dee110..ca1ef40 100644 --- a/src/tdm_server.c +++ b/src/tdm_server.c @@ -511,12 +511,12 @@ tdm_server_init(tdm_private_loop *private_loop) { tdm_private_server *private_server; - if (private_loop->private_server) - return TDM_ERROR_NONE; - TDM_RETURN_VAL_IF_FAIL(private_loop, TDM_ERROR_OPERATION_FAILED); TDM_RETURN_VAL_IF_FAIL(private_loop->wl_display, TDM_ERROR_OPERATION_FAILED); + if (private_loop->private_server) + return TDM_ERROR_NONE; + if (wl_display_add_socket(private_loop->wl_display, "tdm-socket")) { TDM_ERR("createing a tdm-socket failed"); return TDM_ERROR_OPERATION_FAILED; -- 2.7.4