From bb7ef48977ff53434aeb31b9a547678258133799 Mon Sep 17 00:00:00 2001 From: jeon Date: Wed, 4 Sep 2019 17:34:32 +0900 Subject: [PATCH] pepper-keyrouter: fix a coverity issue - PEPPER_CHECK is definition to check invalid values using do-while, so continue command is not work intentionally. - so change to check value condition if instead PEPPER_CHECK(do-while) Change-Id: I2ca32e30b53e8ae2f23114233855ad3224d7895a --- src/lib/keyrouter/pepper-keyrouter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/keyrouter/pepper-keyrouter.c b/src/lib/keyrouter/pepper-keyrouter.c index 2606c8e..d378e69 100644 --- a/src/lib/keyrouter/pepper-keyrouter.c +++ b/src/lib/keyrouter/pepper-keyrouter.c @@ -689,8 +689,10 @@ _pepper_keyrouter_options_set(pepper_keyrouter_t *pepper_keyrouter) tmp = strtok_r(NULL, " ", &buf_ptr); if (!tmp) continue; keycode = atoi(tmp); - PEPPER_CHECK(((0 < keycode) && (keycode < KEYROUTER_MAX_KEYS)), - continue, "Currently %d key is invalid to support\n", keycode); + if ((0 >= keycode) || (keycode >= KEYROUTER_MAX_KEYS)) { + PEPPER_ERROR("Currently %d key is invalid to support\n", keycode); + continue; + } pepper_keyrouter->opts[keycode].enabled = PEPPER_TRUE; -- 2.34.1