fix build warnings

  - warning: specified bound depends on the length of the
    source argument
  - using source argument's length in strncat, strncpy
    can cause string overflow
  - so instead of use source length, to use snprintf

Change-Id: Ica4ece26165670ac968725d8a69a3431e9d9aa5a

diff --git a/src/lib/pepper/utils-file.c b/src/lib/pepper/utils-file.c
index 2fe9272c4ade34f76e19da49830325217643f306..50f09290bc2f35d32a92c314efeb53e5e0cc1d60 100644 (file)
--- a/src/lib/pepper/utils-file.c
+++ b/src/lib/pepper/utils-file.c
@@ -33,6 +33,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <linux/limits.h>
+#include <stdio.h>
 
 static int
 set_cloexec_or_close(int fd)
@@ -110,8 +111,7 @@ pepper_create_anonymous_file(off_t size)
                return -1;
        }
 
-       strncpy(name, path, strlen(path) + 1);
-       strncat(name, template, sizeof(template));
+       snprintf(name, strlen(path) + sizeof(template), "%s%s", path, template);
 
        free(path);
        path = NULL;

diff --git a/src/samples/sample-client.c b/src/samples/sample-client.c
index 144b47598255a67035b54e3e0a07d08ff87f1241..0a6f51a2e85f179929b05c96b46eaac84f4249bd 100644 (file)
--- a/src/samples/sample-client.c
+++ b/src/samples/sample-client.c
@@ -222,8 +222,7 @@ os_create_anonymous_file(off_t size)
        if (!name)
                return -1;
 
-       strncpy(name, path, strlen(path) + 1);
-       strncat(name, template, sizeof(template));
+       snprintf(name, strlen(path) + sizeof(template), "%s%s", path, template);
 
        fd = create_tmpfile_cloexec(name);