From 3d7cafb4680b58be32cb0a72477b5a36bcc24420 Mon Sep 17 00:00:00 2001 From: Lukasz Oleksak Date: Tue, 18 Jun 2024 14:23:20 +0200 Subject: [PATCH] Make 'goto fail_gestures' instruction reachable This patch makes line 320 in function _e_mod_submodules_init(void) in e_mod_main.c file reachable. Change-Id: Ibdc665679f6a1872dbc30d9c6e00223fe09bc5f2 --- src/e_screen_reader_gestures.c | 38 ++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/e_screen_reader_gestures.c b/src/e_screen_reader_gestures.c index b163f6a..dd6e43c 100644 --- a/src/e_screen_reader_gestures.c +++ b/src/e_screen_reader_gestures.c @@ -1789,6 +1789,12 @@ static void _gesture_init() { E_Zone *zone; + zone = e_zone_current_get(); + if (!zone) + { + ERROR("Fail to find zone"); + return; + } cover = E_NEW(Cover, 1); if (!cover) { @@ -1807,28 +1813,23 @@ _gesture_init() scrolling = EINA_FALSE; _last_hover_event_time = -1; - zone = e_zone_current_get(); - if (zone) - { - /* Initialize angle value */ - cover->angle = zone->rot.act; - - /* Keep device geometry information */ - cover->zone.x = zone->x; - cover->zone.y = zone->y; - cover->zone.w = zone->w; - cover->zone.h = zone->h; - } - else - { - ERROR("Fail to find zone"); - } + /* Initialize angle value */ + cover->angle = zone->rot.act; + + /* Keep device geometry information */ + cover->zone.x = zone->x; + cover->zone.y = zone->y; + cover->zone.w = zone->w; + cover->zone.h = zone->h; + cover->up_timer = NULL; } static void _gesture_shutdown(void) { + if (!cover) + return; if (cover->tap_gesture_data.timer) ecore_timer_del(cover->tap_gesture_data.timer); cover->tap_gesture_data.timer = NULL; @@ -1845,6 +1846,11 @@ int _e_mod_atspi_gestures_init(void) { DEBUG("gesture init"); _gesture_init(); + if (!cover) + { + ERROR("failed gesture init"); + return 1; + } _events_init(); return 0; -- 2.34.1