Ecore_Wayland: Patch from Rob Bradford to add missing NULL checks for

ecore_wl_input.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@71957 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 82d26ba..120da09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -735,3 +735,7 @@
 
        * Ecore_Wayland: Update to protocol change - axis events are now fixed point numbers
 
+2012-06-11 Rob Bradford
+
+       * Ecore_Wayland: Add missing null pointer checks on input device
+       deletion (ticket #1031). Not all devices are keyboards.

diff --git a/src/lib/ecore_wayland/ecore_wl_input.c b/src/lib/ecore_wayland/ecore_wl_input.c
index 54ca296..19e39b2 100644 (file)
--- a/src/lib/ecore_wayland/ecore_wl_input.c
+++ b/src/lib/ecore_wayland/ecore_wl_input.c
@@ -238,8 +238,10 @@ _ecore_wl_input_del(Ecore_Wl_Input *input)
    if (input->seat) wl_seat_destroy(input->seat);
    wl_list_remove(&input->link);
 
-   xkb_state_unref(input->xkb.state);
-   xkb_map_unref(input->xkb.keymap);
+   if (input->xkb.state)
+     xkb_state_unref(input->xkb.state);
+   if (input->xkb.keymap)
+     xkb_map_unref(input->xkb.keymap);
    free(input);
 }