Resolves the build error for strncpy

[platform/core/connectivity/bluetooth-frwk.git] / bt-oal / common / oal-utils.c

diff --git a/bt-oal/common/oal-utils.c b/bt-oal/common/oal-utils.c
index 65a7e8e..76861f1 100755 (executable)
--- a/bt-oal/common/oal-utils.c
+++ b/bt-oal/common/oal-utils.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <bluetooth.h>
 #include "oal-utils.h"
+#include "oal-manager.h"
 
 char *bdt_bd2str(const bt_address_t *bdaddr, bdstr_t *bdstr)
 {
@@ -40,15 +41,16 @@ char *bdt_bd2str(const bt_address_t *bdaddr, bdstr_t *bdstr)
        return *bdstr;
 }
 
-char* convert_bdaddr_2_str(const bt_bdaddr_t *bd_addr, char *buf)
+char* convert_bdaddr_2_str(const bt_bdaddr_t *bd_addr, char *buf, int len)
 {
        const uint8_t *p;
 
        if (!bd_addr)
-               return strncpy(buf, "NULL", sizeof("NULL"));
+               return strncpy(buf, "NULL", len);
+
        p = bd_addr->address;
 
-       snprintf(buf, 18, "%02x:%02x:%02x:%02x:%02x:%02x",
+       snprintf(buf, len, "%02x:%02x:%02x:%02x:%02x:%02x",
                        p[0], p[1], p[2], p[3], p[4], p[5]);
 
        return buf;
@@ -56,8 +58,8 @@ char* convert_bdaddr_2_str(const bt_bdaddr_t *bd_addr, char *buf)
 
 char *bdaddr_2_str(const bt_bdaddr_t *bd_addr)
 {
-       static char buf[18];
-       return convert_bdaddr_2_str(bd_addr, buf);
+       static char buf[BT_ADDRESS_STR_LEN];
+       return convert_bdaddr_2_str(bd_addr, buf, BT_ADDRESS_STR_LEN);
 }
 
 void string_to_uuid(char *str, service_uuid_t *p_uuid)