Fixed NULL pointer dereferences

Change-Id: I616b62ab828604a902b7845e5d77966998c4d84f

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index f54c3295d70940630609b34107eac36f5c6ca968..0b982fdf90f105122bd19e07932c441850a1d150 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -236,7 +236,8 @@ _e_comp_wl_input_cb_keyboard_get(struct wl_client *client, struct wl_resource *r
 
    /* if the client owns the focused surface, we need to send an enter */
    focused = e_client_focused_get();
-   if (!focused) return;
+   if ((!focused) || (e_object_is_del(E_OBJECT(focused))) ||
+       (!focused->comp_data) || (!focused->comp_data->surface)) return;
 
    if (client != wl_resource_get_client(focused->comp_data->surface)) return;
    e_comp_wl->kbd.focused = eina_list_append(e_comp_wl->kbd.focused, res);

diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 2bfe489fc99c644816018c7b41ecc1ecf7e5230a..1d741763f2fe539ede2e67d002b1dbd057125928 100644 (file)
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -1061,7 +1061,8 @@ e_pixmap_buffer_clear(E_Pixmap *cp)
      }
 
    /* release the helded buffer by e_client */
-   e_comp_wl_buffer_reference(&cp->client->comp_data->buffer_ref, NULL);
+   if (cp->client->comp_data)
+     e_comp_wl_buffer_reference(&cp->client->comp_data->buffer_ref, NULL);
 
    /* composite object clear */
    e_comp_object_clear(cp->client->frame);