From 59fbfa6ad966815294ed6d256d182c0ece2d18c7 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 12 Mar 2020 08:58:36 +0900 Subject: [PATCH] Fix bugs about handling key events - Checks key map data before calling callback function Change-Id: I458e1d4deaecffdb4f70c5fea3f6fbaff3a65546 Signed-off-by: Hwankyu Jhun --- src/media_key.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/media_key.cc b/src/media_key.cc index f2d11d5..5a5763d 100644 --- a/src/media_key.cc +++ b/src/media_key.cc @@ -175,6 +175,9 @@ class MediaKey { if (handle->cb_ == nullptr) return ECORE_CALLBACK_RENEW; + if (handle->key_map_.find(ev->keyname) == handle->key_map_.end()) + return ECORE_CALLBACK_RENEW; + media_key_e media_key = handle->key_map_[ev->keyname]; handle->cb_(media_key, MEDIA_KEY_STATUS_PRESSED, handle->data_); return ECORE_CALLBACK_RENEW; @@ -191,6 +194,9 @@ class MediaKey { if (handle->cb_ == nullptr) return ECORE_CALLBACK_RENEW; + if (handle->key_map_.find(ev->keyname) == handle->key_map_.end()) + return ECORE_CALLBACK_RENEW; + media_key_e media_key = handle->key_map_[ev->keyname]; handle->cb_(media_key, MEDIA_KEY_STATUS_RELEASED, handle->data_); return ECORE_CALLBACK_RENEW; -- 2.7.4