From 59874911267d98ef6d52f68f5bb7de8305049ab3 Mon Sep 17 00:00:00 2001 From: Hyunho Date: Thu, 17 Jun 2021 11:19:53 +0900 Subject: [PATCH] Fix unchecked return value Change-Id: Ia7726dad78e54d94890081366ff4f5ca5d1fe505 Signed-off-by: Hyunho --- parser/complication_parser_plugin.cc | 22 +++++++++++++++------- watchface-common/watchface-util.cc | 5 ++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/parser/complication_parser_plugin.cc b/parser/complication_parser_plugin.cc index f36b667..aa1f9a0 100644 --- a/parser/complication_parser_plugin.cc +++ b/parser/complication_parser_plugin.cc @@ -111,23 +111,31 @@ static struct xml_to_bundle_key_map __budle_key_map[] = { static uid_t __target_uid; static bool __target_uid_initialized; -static uid_t _get_target_uid(void) { - if (__target_uid_initialized) - return __target_uid; +static int _get_target_uid(uid_t* uid) { + if (__target_uid_initialized) { + *uid = __target_uid; + return 0; + } - pkgmgr_installer_info_get_target_uid(&__target_uid); + if (pkgmgr_installer_info_get_target_uid(&__target_uid) < 0) { + return -1; + } __target_uid_initialized = true; + *uid = __target_uid; - return __target_uid; + return 0; } int complication_parser_plugin_init(void) { - LOGD("complication_parser_plugin_init"); + uid_t uid; + LOGD("complication_parser_plugin_init"); __target_uid_initialized = false; + if (_get_target_uid(&uid) < 0) + return -1; - if (check_db(_get_target_uid())) { + if (check_db(uid)) { complication_parser_plugin_fini(); LOGE("parser init fail"); return -1; diff --git a/watchface-common/watchface-util.cc b/watchface-common/watchface-util.cc index e4056d2..999aca3 100644 --- a/watchface-common/watchface-util.cc +++ b/watchface-common/watchface-util.cc @@ -540,7 +540,10 @@ out: const char* path; bool is_global; - pkgmgr_installer_info_get_target_uid(&target_uid); + if (pkgmgr_installer_info_get_target_uid(&target_uid) < 0) { + LOGE("fail to get uid"); + return nullptr; + } if (target_uid == ROOT_USER || target_uid == tzplatform_getuid(TZ_SYS_GLOBALAPP_USER)) -- 2.7.4