Silence strncpy warning emitted by GCC 8 in ini parser

[lttng-tools.git] / src / common / config / ini.c

diff --git a/src/common/config/ini.c b/src/common/config/ini.c
index 4369a32f93bd3317a9e6d9d08286f6d2d469bbb9..41d299a19be5343bb12518db407422468c05baf0 100644 (file)
--- a/src/common/config/ini.c
+++ b/src/common/config/ini.c
@@ -34,6 +34,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <common/common.h>
 
 #include "ini.h"
 
@@ -81,7 +82,7 @@ static char* find_char_or_comment(const char* s, char c)
 /* Version of strncpy that ensures dest (size bytes) is null-terminated. */
 static char* strncpy0(char* dest, const char* src, size_t size)
 {
-       strncpy(dest, src, size);
+       strncpy(dest, src, size - 1);
        dest[size - 1] = '\0';
        return dest;
 }
@@ -107,7 +108,7 @@ int ini_parse_file(FILE* file, ini_entry_handler handler, void* user)
        int error = 0;
 
 #if !INI_USE_STACK
-       line = (char*)malloc(INI_MAX_LINE);
+       line = (char*)zmalloc(INI_MAX_LINE);
        if (!line) {
                return -2;
        }