video: Fix crash when commit video buffer with deleted E_Client

With change 32a04d07, this crash was made since null buffer can be
given to _e_video_hwc_windows_commit_data_set().
Accessing comp_data of deleted E_Client caused a crash.

Change-Id: Icaa8e0022a8d81c51f611a0180f65112479979bf

diff --git a/src/bin/video/iface/e_video_hwc.c b/src/bin/video/iface/e_video_hwc.c
index d554049db6874e882e73127c23d0e220aa19a5cf..ffdaddb49ffad6cb93496c865ad960ecf542c2ac 100644 (file)
--- a/src/bin/video/iface/e_video_hwc.c
+++ b/src/bin/video/iface/e_video_hwc.c
@@ -1985,12 +1985,16 @@ e_video_hwc_client_mask_update(E_Video_Hwc *evh)
    Eina_Bool punch = EINA_FALSE;
    int bw, bh;
 
+   if (e_object_is_del(E_OBJECT(evh->ec)))
+     return;
+
    if (e_video_debug_punch_value_get())
      punch = EINA_TRUE;
    else if ((topmost = e_comp_wl_topmost_parent_get(evh->ec)))
      {
         /* if it's laid above main surface */
-        if (eina_list_data_find(topmost->comp_data->sub.list, evh->ec))
+        if ((topmost->comp_data) &&
+            (eina_list_data_find(topmost->comp_data->sub.list, evh->ec)))
           punch = EINA_TRUE;
         /* if it's laid under main surface and main surface is transparent */
         else if (topmost->argb)

diff --git a/src/bin/video/iface/e_video_hwc_windows.c b/src/bin/video/iface/e_video_hwc_windows.c
index 28d25cbefb392c0f484ea1ce0150a3a7edaf1519..b5ccbf8a1a8005bd37fc1c6857d14ce88363d6c7 100644 (file)
--- a/src/bin/video/iface/e_video_hwc_windows.c
+++ b/src/bin/video/iface/e_video_hwc_windows.c
@@ -82,7 +82,8 @@ end:
        " dst(%d,%d, %dx%d), transform(%d)",
        e_client_util_name_get(evhw->base.ec) ?: "No Name" ,
        evhw->base.ec->netwm.pid,
-       wl_resource_get_id(evhw->base.ec->comp_data->surface),
+       (evhw->base.ec->comp_data ?
+        wl_resource_get_id(evhw->base.ec->comp_data->surface) : -1),
        vbuf, (vbuf ? vbuf->ref_cnt : 0),
        evhw->commit_data.info.src_config.size.h,
        evhw->commit_data.info.src_config.size.v,