Remove warning for GCC-9

Change-Id: Iefda0c2fafd09efe06ab3d8d73f593e3de406e7a
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>

diff --git a/src/dbus_daemon.c b/src/dbus_daemon.c
index 23234de..6959284 100644 (file)
--- a/src/dbus_daemon.c
+++ b/src/dbus_daemon.c
@@ -138,7 +138,7 @@ static int bus_acquire_name(int fd, const char *name)
        item = cmd->items;
        item->type = KDBUS_ITEM_NAME;
        item->size = KDBUS_ITEM_HEADER_SIZE + strlen(name) + 1;
-       strncpy(item->str, name, strlen(name) + 1);
+       memcpy(item->str, name, strlen(name) + 1);
 
        /*
         * Employ the command on the connection owner file descriptor.
@@ -223,7 +223,7 @@ int main(int argc, char* argv[])
        if (fd < 0)
                return -1;
 
-       while (server_names[j] != '\0') {
+       while (server_names[j]) {
                if (bus_acquire_name(fd, server_names[j]))
                        return -1;
                j++;

diff --git a/src/libdbuspolicy1.cpp b/src/libdbuspolicy1.cpp
index 1c8f2c3..2e53479 100644 (file)
--- a/src/libdbuspolicy1.cpp
+++ b/src/libdbuspolicy1.cpp
@@ -69,15 +69,19 @@ struct udesc {
        {
                uid = uid_;
                gid = gid_;
-               if (label_)
-                       strncpy(label, label_, strlen(label_) + 1);
+               if (label_) {
+                       if (sizeof(label) > strlen(label_))
+                               memcpy(label, label_, strlen(label_) + 1);
+                       else
+                               LOGE("Error: failed to strcpy, length of label(%s) exceed 255", label_);
+               }
        }
 
 private:
        std::once_flag init_once_done;
        void init_once()
        {
-               char buf[1024];
+               char buf[256];
                int attr_fd;
                int r;