diff options
author | Lokesh <l.kasana@samsung.com> | 2019-09-06 13:51:58 +0530 |
---|---|---|
committer | saerome.kim <saerome.kim@samsung.com> | 2019-09-16 21:03:28 +0900 |
commit | 3859c8525efca5d63cc5c165387fb4c1a4b10de0 (patch) | |
tree | 5ad02acac61128194ae43aec88e6eefc9ba27d9a | |
parent | 75a21e1d9512756408893048ab468dcaa8079528 (diff) | |
download | user-awareness-3859c8525efca5d63cc5c165387fb4c1a4b10de0.tar.gz user-awareness-3859c8525efca5d63cc5c165387fb4c1a4b10de0.tar.bz2 user-awareness-3859c8525efca5d63cc5c165387fb4c1a4b10de0.zip |
Fixed dexter issues
Checker: 'sec_bof_strncat'
Defect ID: 33, 34 and 36.
Change-Id: I46c9bd3da8ffbc74567a94d0c0b22e87b9c6b7f7
Signed-off-by: Lokesh <l.kasana@samsung.com>
-rw-r--r-- | packaging/capi-network-ua.spec | 2 | ||||
-rw-r--r-- | test/uat-common.c | 2 | ||||
-rw-r--r-- | test/uat-common.h | 2 | ||||
-rw-r--r-- | test/uat-init.c | 9 | ||||
-rw-r--r-- | test/uat-menu.c | 4 | ||||
-rw-r--r-- | test/uat-sensors.c | 7 |
6 files changed, 14 insertions, 12 deletions
diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec index 86a624c..db50dcd 100644 --- a/packaging/capi-network-ua.spec +++ b/packaging/capi-network-ua.spec @@ -1,6 +1,6 @@ Name: capi-network-ua Summary: User Awareness Framework CAPI -Version: 0.7.2 +Version: 0.7.3 Release: 1 License: Apache-2.0 Source0: %{name}-%{version}.tar.gz diff --git a/test/uat-common.c b/test/uat-common.c index 499da2e..4b9b838 100644 --- a/test/uat-common.c +++ b/test/uat-common.c @@ -111,7 +111,7 @@ const char* uat_get_str_from_uat_mac_type(int mac_type) } } -const char* uat_get_sensor_bitmask_str(int sensor) +const char* uat_get_sensor_bitmask_str(ua_sensor_e sensor) { switch (sensor) { /* CHECK: List all enum values here */ diff --git a/test/uat-common.h b/test/uat-common.h index 0be6105..a84650e 100644 --- a/test/uat-common.h +++ b/test/uat-common.h @@ -43,7 +43,7 @@ const char* uat_get_error_str(int err); const char* uat_get_sensor_str(int sensors); const char* uat_get_mac_type_str(int sensor); const char* uat_get_str_from_uat_mac_type(int mac_type); -const char* uat_get_sensor_bitmask_str(int sensor); +const char* uat_get_sensor_bitmask_str(ua_sensor_e sensor); char* uat_get_time(void); #ifdef __cplusplus diff --git a/test/uat-init.c b/test/uat-init.c index 7560319..77c7fb5 100644 --- a/test/uat-init.c +++ b/test/uat-init.c @@ -31,7 +31,7 @@ extern ua_monitor_h g_ua_mon_h; /**< Monitor handle */ extern ua_service_h g_service_h; /**< Service handle */ extern char g_service_str[MENU_DATA_SIZE + 1]; /**< Service name */ extern char g_sensor_list_str[MENU_DATA_SIZE + 1]; /**< Sendosr list string */ -extern unsigned short g_sensor_list; /**< Added sensor list */ +extern unsigned int g_sensor_list; /**< Added sensor list */ static char g_app_id_str[MENU_DATA_SIZE + 1] = {0,}; /**< User app id */ static char g_uid[MENU_DATA_SIZE + 1] = {0,}; /**< User id */ @@ -150,7 +150,7 @@ static int run_ua_monitor_create(MManager *mm, struct menu_data *menu) return RET_SUCCESS; memset(g_sensor_list_str, 0, MENU_DATA_SIZE + 1); - for (int i = UA_SENSOR_BT ; i < UA_SENSOR_MAX; i <<= 1) { + for (unsigned int i = UA_SENSOR_BT ; i < UA_SENSOR_MAX; i <<= 1) { ret = ua_monitor_is_sensor_available(i, &is_available); if (UA_ERROR_NONE == ret && is_available) { @@ -161,8 +161,9 @@ static int run_ua_monitor_create(MManager *mm, struct menu_data *menu) buf = uat_get_sensor_bitmask_str(i); strncat(g_sensor_list_str, buf, - sizeof(g_sensor_list_str) - strlen(g_sensor_list_str) - 1); - strncat(g_sensor_list_str, " ", 2); + sizeof(g_sensor_list_str) - strlen(g_sensor_list_str) - 1); + strncat(g_sensor_list_str, " ", + sizeof(g_sensor_list_str) - strlen(g_sensor_list_str) - 1); } is_available = false; diff --git a/test/uat-menu.c b/test/uat-menu.c index 17a0ee0..12d2420 100644 --- a/test/uat-menu.c +++ b/test/uat-menu.c @@ -407,7 +407,7 @@ static void _hex_dump(const char *pad, int size, const void *data) snprintf(buf, 255, "%s%04X: ", pad, 0); for (i = 0; i < size; i++) { snprintf(hex, 4, "%02X ", p[i]); - strncat(buf, hex, 255 - strlen(buf) - 1); + strncat(buf, hex, sizeof(buf) - strlen(buf) - 1); if ((i + 1) % 8 == 0) { if ((i + 1) % 16 == 0) { @@ -415,7 +415,7 @@ static void _hex_dump(const char *pad, int size, const void *data) memset(buf, 0, 255); snprintf(buf, 255, "%s%04X: ", pad, i + 1); } else { - strncat(buf, TAB_SPACE, 255 - strlen(buf) - 1); + strncat(buf, TAB_SPACE, sizeof(buf) - strlen(buf) - 1); } } } diff --git a/test/uat-sensors.c b/test/uat-sensors.c index be82bee..5257130 100644 --- a/test/uat-sensors.c +++ b/test/uat-sensors.c @@ -34,7 +34,7 @@ static char g_sensor_type_str[MENU_DATA_SIZE + 1] = {0,}; /**< Selected Sensor t static char g_presence_threshold[MENU_DATA_SIZE + 1] = {0,}; /**< PRESENCE threashold for litght sensor */ static char g_absence_threshold[MENU_DATA_SIZE + 1] = {0,}; /**< ABSENCE threashold for litght sensor */ -unsigned short g_sensor_list; /**< Added sensor list */ +unsigned int g_sensor_list; /**< Added sensor list */ char g_sensor_list_str[MENU_DATA_SIZE + 1] = {0,}; /**< Added sensor list string */ static unsigned int __sensor_type_to_bitmask(int idx) @@ -71,8 +71,9 @@ static bool __ua_monitor_foreach_sensor_cb(ua_sensor_e sensor, void *user_data) { const char *buf = uat_get_sensor_bitmask_str(sensor); strncat(g_sensor_list_str, buf, - sizeof(g_sensor_list_str) - strlen(g_sensor_list_str) - 1); - strncat(g_sensor_list_str, " ", 2); + sizeof(g_sensor_list_str) - strlen(g_sensor_list_str) - 1); + strncat(g_sensor_list_str, " ", + sizeof(g_sensor_list_str) - strlen(g_sensor_list_str) - 1); return TRUE; } |