xkbcomp: fix CVE-2018-15858tizen_5.5.m2_releasesubmit/tizen_5.5_mobile_hotfix/20201026.185107submit/tizen_5.5/20191031.000007submit/tizen_5.0/20181107.044303submit/tizen/20181112.074735submit/tizen/20181107.044109submit/tizen/20181030.101450accepted/tizen/unified/20181113.085931accepted/tizen/5.5/unified/mobile/hotfix/20201027.073721accepted/tizen/5.5/unified/20191031.011009accepted/tizen/5.0/unified/20181108.074345tizen_5.5_mobile_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.0_unified

Change-Id: I77edf8922955477bc815f374a7def7d76d82e11e
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 7f5955e..8cd838c 100644
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -596,14 +596,13 @@ CopyKeyAliasesToKeymap(struct xkb_keymap *keymap, KeyNamesInfo *info)
         key_aliases = calloc(num_key_aliases, sizeof(*key_aliases));
         if (!key_aliases)
             return false;
-    }
-
-    i = 0;
-    darray_foreach(alias, info->aliases) {
-        if (alias->real != XKB_ATOM_NONE) {
-            key_aliases[i].alias = alias->alias;
-            key_aliases[i].real = alias->real;
-            i++;
+        i = 0;
+        darray_foreach(alias, info->aliases) {
+            if (alias->real != XKB_ATOM_NONE) {
+                key_aliases[i].alias = alias->alias;
+                key_aliases[i].real = alias->real;
+                i++;
+            }
         }
     }