From 85014f741c538fc1cee7225308744ccc2a130139 Mon Sep 17 00:00:00 2001 From: jeon Date: Fri, 14 Feb 2020 17:09:04 +0900 Subject: [PATCH] e_keyrouter: fix memory leaks - fix coverity issues Change-Id: I0c9078f11dc6dbc44232b5d1c63fb726ff018530 --- src/bin/e_keyrouter_events.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/bin/e_keyrouter_events.c b/src/bin/e_keyrouter_events.c index d055e4f2d5..132f17bf7e 100644 --- a/src/bin/e_keyrouter_events.c +++ b/src/bin/e_keyrouter_events.c @@ -188,7 +188,6 @@ failed: static Eina_Bool _e_keyrouter_long_timer(void *data) { - char *keyname; E_Keyrouter_Event_Key_Long *ev; ev = E_NEW(E_Keyrouter_Event_Key_Long, 1); @@ -205,13 +204,8 @@ _e_keyrouter_long_timer(void *data) _e_keyrouter_key_cancel(krt->longkey.key); ecore_event_add(E_KEYROUTER_EVENT_KEY_LONG, ev, NULL, NULL); - keyname = e_keyrouter_util_keyname_get_from_keycode(krt->longkey.key); - if (keyname) - { - KLINF("LONGKEY : %s(%d) long press event is generated.\n", keyname, krt->longkey.key); - free(keyname); - keyname = NULL; - } + KLINF("LONGKEY : %s(%d) long press event is generated.\n", + krt->HardKeys[krt->longkey.key].keyname, krt->longkey.key); krt->longkey.timer = NULL; @@ -282,9 +276,9 @@ _e_keyrouter_composition_key_event(Eina_Bool pressed) ev->timestamp = (unsigned int)(ecore_time_get()*1000); KLINF("COMPOSITION_KEY : %s(%d) and %s(%d) composition key %s event is generated (time: %d).\n", - e_keyrouter_util_keyname_get_from_keycode(ev->keys[0]), ev->keys[0], - e_keyrouter_util_keyname_get_from_keycode(ev->keys[1]), ev->keys[1], - pressed?"press":"release", ev->timestamp); + krt->HardKeys[ev->keys[0]].keyname, ev->keys[0], + krt->HardKeys[ev->keys[1]].keyname, ev->keys[1], + pressed?"press":"release", ev->timestamp); if (pressed) ecore_event_add(E_KEYROUTER_EVENT_KEY_COMPOSITION_PRESS, ev, NULL, NULL); -- 2.34.1