tdm_server: clean up tdm_server_init() 52/100452/2
authorYoungJun Cho <yj44.cho@samsung.com>
Mon, 28 Nov 2016 07:19:57 +0000 (16:19 +0900)
committerSooChan Lim <sc1.lim@samsung.com>
Mon, 28 Nov 2016 08:31:45 +0000 (00:31 -0800)
This patch cleans up tdm_server_init() not to dereference when private_loop is NULL.

Change-Id: I846c47130992264ff39d194e7ca4299e4970bc2c
Signed-off-by: YoungJun Cho <yj44.cho@samsung.com>
src/tdm_server.c

index 4dee110..ca1ef40 100644 (file)
@@ -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;