From: Sangjin Lee <lsj119@samsung.com>
Date: Tue, 1 Aug 2017 04:18:12 +0000 (+0900)
Subject: wayland_shm: add safety check
X-Git-Tag: accepted/tizen/4.0/unified/20170816.011633~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=006be2aca618dba9517f56f70b185ae2ad55eed4;p=platform%2Fupstream%2Fefl.git

wayland_shm: add safety check

Change-Id: Ic2d1c6e4462b4dd8d50adbbf662cf2b253784398
---

diff --git a/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c b/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c
index 8e814e5..88f74ce 100644
--- a/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_tbmbuf.c
@@ -517,11 +517,13 @@ static const struct wl_registry_listener _shm_wl_registry_listener =
 static void
 _shm_tzsurf_init(struct wl_display *disp)
 {
-   struct wl_event_queue *queue;
-   struct wl_registry *registry;
+   struct wl_event_queue *queue = NULL;
+   struct wl_registry *registry = NULL;
 
    queue = wl_display_create_queue(disp);
+   EINA_SAFETY_ON_NULL_GOTO(queue, err_registry);
    registry = wl_display_get_registry(disp);
+   EINA_SAFETY_ON_NULL_GOTO(queue, err_registry);
 
    wl_proxy_set_queue((struct wl_proxy *)registry, queue);
    wl_registry_add_listener(registry, &_shm_wl_registry_listener, NULL);
@@ -532,8 +534,10 @@ _shm_tzsurf_init(struct wl_display *disp)
    wl_proxy_set_queue((struct wl_proxy *)tzsurf, NULL);
 
 err_registry:
-   wl_registry_destroy(registry);
-   wl_event_queue_destroy(queue);
+   if (registry)
+     wl_registry_destroy(registry);
+   if (queue)
+     wl_event_queue_destroy(queue);
    return;
 }