Fix crash issue regarding CM key popup

Change-Id: Id5e3546721b47942e7d865d575db0248a1ab932e
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/src/include/ise-language-change.h b/src/include/ise-language-change.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ise-language-change.cpp b/src/ise-language-change.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ise.cpp b/src/ise.cpp
index edfd1f5..6afd4a5 100644 (file)
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -1091,11 +1091,13 @@ ise_show(int ic)
         }
 
         // Update CM key button
-        if (strcmp(_cm_key_list[_current_cm_key_id], USER_KEYSTRING_EMOTICON) == 0) {
-            if (ise_is_emoticons_disabled())
-                ise_set_cm_private_key(ise_get_cm_key_id(USER_KEYSTRING_OPTION));
-            else
-                ise_set_cm_private_key(_current_cm_key_id);
+        if (_current_cm_key_id >= 0 && _current_cm_key_id < CM_KEY_LIST_SIZE) {
+            if (strcmp(_cm_key_list[_current_cm_key_id], USER_KEYSTRING_EMOTICON) == 0) {
+                if (ise_is_emoticons_disabled())
+                    ise_set_cm_private_key(ise_get_cm_key_id(USER_KEYSTRING_OPTION));
+                else
+                    ise_set_cm_private_key(_current_cm_key_id);
+            }
         }
 
         // Update space key button