source/collectd
1
0
Fork 0
mirror of https://github.com/collectd/collectd.git synced 2026-02-09 04:09:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

snmp_agent plugin: Fix strncat() truncation warning.

Browse Source 
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);
         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```
This commit is contained in:
Florian Forster
2020-09-03 09:11:07 +02:00
parent 70296d5aac
commit 7caa07f622
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/snmp_agent.c
View File

@@ -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);
}
}