From cc795bfbda6c3272049bc526156bfb7cfb7f2b8e Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 2 Dec 2016 09:25:54 -0500 Subject: [PATCH] Revert "verify valid client comp_data before accessing it directly" Reverting this in favor of a different fix. This reverts commit bbad74406058ec2e373dbd6efe3fa2592a21d8eb. --- src/modules/wl_desktop_shell/xdg5.c | 5 +---- src/modules/wl_desktop_shell/xdg6.c | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/modules/wl_desktop_shell/xdg5.c b/src/modules/wl_desktop_shell/xdg5.c index 6db889e72..7295f16d8 100644 --- a/src/modules/wl_desktop_shell/xdg5.c +++ b/src/modules/wl_desktop_shell/xdg5.c @@ -881,10 +881,7 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t static void _xdg5_client_hook_del(void *d EINA_UNUSED, E_Client *ec) { - E_Shell_Data *shd; - - if (!ec->comp_data) return; - shd = ec->comp_data->shell.data; + E_Shell_Data *shd = ec->comp_data->shell.data; if (shd && (shd->version != 5)) return; if (ec->comp_data->shell.surface) diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c index dc4b763ce..d98bfc905 100644 --- a/src/modules/wl_desktop_shell/xdg6.c +++ b/src/modules/wl_desktop_shell/xdg6.c @@ -1325,7 +1325,6 @@ _xdg6_client_destroy(E_Client *ec) { E_Shell_Data *shd; - if (!ec->comp_data) return; shd = ec->comp_data->shell.data; if (shd && (shd->version != 6)) return; if (ec->comp_data->shell.surface)