]> git.ipfire.org Git - thirdparty/ulogd2.git/commit
output: MYSQL: improve mapping of DB columns to input-keys
authorJeremy Sowden <jeremy@azazel.net>
Tue, 30 Nov 2021 10:55:43 +0000 (10:55 +0000)
committerPablo Neira Ayuso <pablo@netfilter.org>
Mon, 6 Dec 2021 21:28:42 +0000 (22:28 +0100)
commit33e2c5b2f63844a3e08fc287d0d8921cbc3b8f86
tree4481e8ee0687626ae3bf46b77e2ebe873ead2aa2
parent23dcfc558ecfcf7cc7ef8a002dea8a3ac31f0335
output: MYSQL: improve mapping of DB columns to input-keys

Currently, we copy the column-name to a buffer, iterate over it to
replace the underscores with full-stops, using `strchr` from the start
of the buffer on each iteration, then copy the buffer to the input-key's
`name` member.

Apart from the inefficiency, `strncpy` is used to do the copies, which
leads gcc to complain:

  ulogd_output_MYSQL.c:149:17: warning: `strncpy` output may be truncated copying 31 bytes from a string of length 31

Furthermore, the buffer is not initialized, which means that there is
also a possible buffer overrun if the column-name is too long, since
`strncpy` will not append a NUL.

Instead, copy the column-name directly to the input-key using
`snprintf`, and run `strchr` from the last underscore on each iteration.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
output/mysql/ulogd_output_MYSQL.c