E SVN: devilhorns IN trunk/ecore: . src/lib/ecore_wayland

[Enlightenment S. <no-...@en...>]

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

Author:       devilhorns
Date:         2012-06-11 10:11:38 -0700 (Mon, 11 Jun 2012)
New Revision: 71957
Trac:         http://trac.enlightenment.org/e/changeset/71957

Modified:
  trunk/ecore/ChangeLog trunk/ecore/src/lib/ecore_wayland/ecore_wl_input.c 

Modified: trunk/ecore/ChangeLog
===================================================================
--- trunk/ecore/ChangeLog	2012-06-11 15:36:37 UTC (rev 71956)
+++ trunk/ecore/ChangeLog	2012-06-11 17:11:38 UTC (rev 71957)
@@ -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.

Modified: trunk/ecore/src/lib/ecore_wayland/ecore_wl_input.c
===================================================================
--- trunk/ecore/src/lib/ecore_wayland/ecore_wl_input.c	2012-06-11 15:36:37 UTC (rev 71956)
+++ trunk/ecore/src/lib/ecore_wayland/ecore_wl_input.c	2012-06-11 17:11:38 UTC (rev 71957)
@@ -238,8 +238,10 @@
    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);
 }