silence stringio truncation warning

give a bigger number as a size and add nul byte at the end of array
in case of causing truncation.

Change-Id: I8db4fb74774810b83c2f92bd21ed4d1a0943b063

diff --git a/src/tdm_helper.c b/src/tdm_helper.c
index 08477f1..5fe5403 100644 (file)
--- a/src/tdm_helper.c
+++ b/src/tdm_helper.c
@@ -295,7 +295,7 @@ tdm_helper_dump_buffer(tbm_surface_h buffer, const char *file)
                strncat(p, file, len);
                p += len;
                *(p++) = '.';
-               strncat(p, ext, 3);
+               strncat(p, ext, 4);
                p += 3;
                *p = '\0';
        } else {

diff --git a/src/tdm_server.c b/src/tdm_server.c
index 25ad51d..3c32a54 100644 (file)
--- a/src/tdm_server.c
+++ b/src/tdm_server.c
@@ -148,12 +148,11 @@ _tdm_server_get_process_name(pid_t pid, char *name, unsigned int size)
 
        len = fread(pname, sizeof(char), TDM_NAME_LEN, h);
        if (len == 0) {
-               strncpy(pname, "NO NAME", 7);
-               len = 8;
+               strncpy(pname, "NO NAME", sizeof(pname));
+               pname[sizeof(pname) - 1] = '\0';
        }
-       pname[len - 1] = '\0';
 
-       strncpy(name, pname, size - 1);
+       strncpy(name, pname, size);
        name[size - 1] = '\0';
 
        fclose(h);
@@ -1403,7 +1402,9 @@ _tdm_server_cb_debug(struct wl_client *client, struct wl_resource *resource, con
                char buffer[TDM_DEBUG_REPLY_MSG_LEN];
                int copylen = TDM_MIN(size, sizeof(buffer) - 1);
 
-               strncpy(buffer, m, copylen);
+               strncpy(buffer, m, sizeof(buffer));
+               buffer[sizeof(buffer) - 1] = '\0';
+
                m += copylen;
                size -= copylen;
 

diff --git a/tools/tdm_test_client.c b/tools/tdm_test_client.c
index ab12626..14feed9 100644 (file)
--- a/tools/tdm_test_client.c
+++ b/tools/tdm_test_client.c
@@ -520,7 +520,7 @@ _tdm_client_dump_buffer(tbm_surface_h buffer, const char *file)
                strncat(p, file, len);
                p += len;
                *(p++) = '.';
-               strncat(p, ext, 3);
+               strncat(p, ext, 4);
                p += 3;
                *p = '\0';
        } else {