wayland-common: Added missing null check for return value of wl_event_loop_add when...

Change-Id: I066e85eb3426889cc4b2e405b9c772beb48109cc

diff --git a/src/lib/wayland/wayland-common.c b/src/lib/wayland/wayland-common.c
index 9ac145f5495c3af186f39dab9b67d577fb41ec5d..f97d1c9c76bf7862dbdfebbe130260b2fac70054 100644 (file)
--- a/src/lib/wayland/wayland-common.c
+++ b/src/lib/wayland/wayland-common.c
@@ -126,18 +126,15 @@ pepper_wayland_connect(pepper_compositor_t *compositor, const char *socket_name)
        conn->gl_renderer = pepper_gl_renderer_create(compositor, conn->display,
                                                "wayland");
        conn->pixman_renderer = pepper_pixman_renderer_create(compositor);
-
-       if (!conn->pixman_renderer) {
-               string_free(conn->socket_name);
-               wl_display_disconnect(conn->display);
-               free(conn);
-               return NULL;
-       }
+       PEPPER_CHECK(conn->pixman_renderer, goto error,
+               "pepper_pixman_renderer_create() failed.\n");
 
        compositor_display = pepper_compositor_get_display(compositor);
        loop = wl_display_get_event_loop(compositor_display);
        conn->event_source = wl_event_loop_add_fd(loop, conn->fd, WL_EVENT_READABLE,
                                                 handle_wayland_event, conn);
+       PEPPER_CHECK(conn->event_source, goto error,
+               "wl_event_loop_add() failed.\n");
        wl_event_source_check(conn->event_source);
 
        pepper_list_init(&conn->seat_list);
@@ -148,6 +145,13 @@ pepper_wayland_connect(pepper_compositor_t *compositor, const char *socket_name)
        wl_display_roundtrip(conn->display);
 
        return conn;
+
+error:
+       string_free(conn->socket_name);
+       wl_display_disconnect(conn->display);
+       free(conn);
+
+       return NULL;
 }
 
 PEPPER_API void