Fixed dexter issues

Checker: 'sec_bof_strncat'
Defect ID: 33, 34 and 36.

Change-Id: I46c9bd3da8ffbc74567a94d0c0b22e87b9c6b7f7
Signed-off-by: Lokesh <l.kasana@samsung.com>

diff --git a/packaging/capi-network-ua.spec b/packaging/capi-network-ua.spec
index 86a624c32f08d1103f9309b2262e967cbc23585f..db50dcd26e8f4b67062005806043107ddc6be7c9 100644 (file)
--- 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 499da2edb07e0138d81356613da211aa81dc9fb7..4b9b8381db100a588c5076802c4163ed46b55468 100644 (file)
--- 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 0be6105d698021de4c079351ab695c1f20d71b3b..a84650e571f950ac6046e0b55370f570cce6e49e 100644 (file)
--- 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 75603192cd3cb53442bc051971d602ec0fd7ff2e..77c7fb5c01e6a93dbe41ca27aeec2765fa353f48 100644 (file)
--- 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 17a0ee060fc0f841ac8bddd7534162296eee300e..12d24207b143e6d042c528cd0b8c977bd5fb0a07 100644 (file)
--- 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 be82beea62534250ae4680b75d24b39a9285bdbf..5257130eeed729a9149e979f57fa3200fe41714e 100644 (file)
--- 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;
 }