Merge pull request #3021 from rubenk/libcollectdclient-fix-stringop-warning
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 12 Feb 2019 08:57:46 +0000 (09:57 +0100)
committerGitHub <noreply@github.com>
Tue, 12 Feb 2019 08:57:46 +0000 (09:57 +0100)
Libcollectdclient fix stringop warning

src/libcollectdclient/network_parse.c

index 73476fb..4c610bb 100644 (file)
@@ -154,11 +154,12 @@ static int parse_string(void *payload, size_t payload_size, char *out,
                         size_t out_size) {
   char *in = payload;
 
-  if ((payload_size < 1) || (in[payload_size - 1] != 0) ||
+  if ((payload_size < 1) || (in[payload_size - 1] != '\0') ||
       (payload_size > out_size))
     return EINVAL;
 
-  strncpy(out, in, out_size);
+  strncpy(out, in, out_size - 1);
+  out[out_size - 1] = '\0';
   return 0;
 }