From: Florian Forster <octo@google.com>
Date: Thu, 3 Sep 2020 07:11:07 +0000 (+0200)
Subject: snmp_agent plugin: Fix strncat() truncation warning.
X-Git-Tag: collectd-5.12.0~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7caa07f622ac01cf09dd6900449e8ebbe4e2f329;p=thirdparty%2Fcollectd.git

snmp_agent plugin: Fix strncat() truncation warning.

Fixes:

```
src/snmp_agent.c:965:9: error: ‘strncat’ output may be truncated copying between 0 and 127 bytes from a string of length 127 [-Werror=stringop-truncation]
         strncat(out, str, DATA_MAX_NAME_LEN - strlen(out) - 1);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
---

diff --git a/src/snmp_agent.c b/src/snmp_agent.c
index bb4a7e427..4e0a0e8af 100644
--- a/src/snmp_agent.c
+++ b/src/snmp_agent.c
@@ -948,7 +948,6 @@ static int snmp_agent_parse_oid_index_keys(const table_definition_t *td,
 static int snmp_agent_build_name(char **name, c_avl_tree_t *tokens) {
   int *pos;
   token_t *tok;
-  char str[DATA_MAX_NAME_LEN];
   char out[DATA_MAX_NAME_LEN] = {0};
   c_avl_iterator_t *it = c_avl_get_iterator(tokens);
 
@@ -958,14 +957,15 @@ static int snmp_agent_build_name(char **name, c_avl_tree_t *tokens) {
   }
 
   while (c_avl_iterator_next(it, (void **)&pos, (void **)&tok) == 0) {
-    strncat(out, tok->str, DATA_MAX_NAME_LEN - strlen(out) - 1);
+    strncat(out, tok->str, sizeof(out) - strlen(out) - 1);
     if (tok->key != NULL) {
       if (tok->key->type == ASN_INTEGER) {
-        ssnprintf(str, sizeof(str), "%ld", *tok->key->val.integer);
-        strncat(out, str, DATA_MAX_NAME_LEN - strlen(out) - 1);
+        char *ptr = &out[strlen(out)];
+        size_t sz = sizeof(out) - strlen(out);
+        ssnprintf(ptr, sz, "%ld", *tok->key->val.integer);
       } else /* OCTET_STR */
         strncat(out, (char *)tok->key->val.string,
-                DATA_MAX_NAME_LEN - strlen(out) - 1);
+                sizeof(out) - strlen(out) - 1);
     }
   }