summaryrefslogtreecommitdiff
path: root/src/lib/ecore_wl2/ecore_wl2_input.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-05-12 12:08:32 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-05-12 12:08:25 -0400
commit6fc8ea3c4bfcc67faeb5f46a36bd85fdb8f5759c (patch)
treeffd2e5c450293719cca61351cb96674df378e796 /src/lib/ecore_wl2/ecore_wl2_input.c
parent0d9a7a6d987941c514c13524f881b7eeb31ff209 (diff)
ecore-wl2: add checks for a valid display object in ecore_wl2_input fns
no display = invalid object, so this needs checking
Diffstat (limited to 'src/lib/ecore_wl2/ecore_wl2_input.c')
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_input.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c b/src/lib/ecore_wl2/ecore_wl2_input.c
index 636ddf93ba..b95fbd6145 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -1557,7 +1557,7 @@ EAPI void
1557ecore_wl2_input_grab(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, unsigned int button) 1557ecore_wl2_input_grab(Ecore_Wl2_Input *input, Ecore_Wl2_Window *window, unsigned int button)
1558{ 1558{
1559 EINA_SAFETY_ON_NULL_RETURN(input); 1559 EINA_SAFETY_ON_NULL_RETURN(input);
1560 1560 EINA_SAFETY_ON_NULL_RETURN(input->display);
1561 _ecore_wl2_input_grab(input, window, button); 1561 _ecore_wl2_input_grab(input, window, button);
1562} 1562}
1563 1563
@@ -1565,7 +1565,7 @@ EAPI void
1565ecore_wl2_input_ungrab(Ecore_Wl2_Input *input) 1565ecore_wl2_input_ungrab(Ecore_Wl2_Input *input)
1566{ 1566{
1567 EINA_SAFETY_ON_NULL_RETURN(input); 1567 EINA_SAFETY_ON_NULL_RETURN(input);
1568 1568 EINA_SAFETY_ON_NULL_RETURN(input->display);
1569 _ecore_wl2_input_ungrab(input); 1569 _ecore_wl2_input_ungrab(input);
1570} 1570}
1571 1571
@@ -1573,7 +1573,7 @@ EAPI struct wl_seat *
1573ecore_wl2_input_seat_get(Ecore_Wl2_Input *input) 1573ecore_wl2_input_seat_get(Ecore_Wl2_Input *input)
1574{ 1574{
1575 EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL); 1575 EINA_SAFETY_ON_NULL_RETURN_VAL(input, NULL);
1576 1576 EINA_SAFETY_ON_NULL_RETURN_VAL(input->display, NULL);
1577 return input->wl.seat; 1577 return input->wl.seat;
1578} 1578}
1579 1579
@@ -1583,7 +1583,7 @@ ecore_wl2_input_seat_capabilities_get(Ecore_Wl2_Input *input)
1583 Ecore_Wl2_Seat_Capabilities cap = ECORE_WL2_SEAT_CAPABILITIES_NONE; 1583 Ecore_Wl2_Seat_Capabilities cap = ECORE_WL2_SEAT_CAPABILITIES_NONE;
1584 1584
1585 EINA_SAFETY_ON_NULL_RETURN_VAL(input, cap); 1585 EINA_SAFETY_ON_NULL_RETURN_VAL(input, cap);
1586 1586 EINA_SAFETY_ON_NULL_RETURN_VAL(input->display, 0);
1587 if (input->wl.keyboard) 1587 if (input->wl.keyboard)
1588 cap |= ECORE_WL2_SEAT_CAPABILITIES_KEYBOARD; 1588 cap |= ECORE_WL2_SEAT_CAPABILITIES_KEYBOARD;
1589 if (input->wl.pointer) 1589 if (input->wl.pointer)
@@ -1597,5 +1597,6 @@ EAPI unsigned int
1597ecore_wl2_input_seat_id_get(Ecore_Wl2_Input *input) 1597ecore_wl2_input_seat_id_get(Ecore_Wl2_Input *input)
1598{ 1598{
1599 EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0); 1599 EINA_SAFETY_ON_NULL_RETURN_VAL(input, 0);
1600 EINA_SAFETY_ON_NULL_RETURN_VAL(input->display, 0);
1600 return input->id; 1601 return input->id;
1601} 1602}