Fix string truncation warnings
PATCH 1/1 Fix string truncation warnings
From: Stephen Hemminger <[email protected]>
The strncatf macro will cause warnings with latest GCC
if the sizeof the destination buffer is smaller than the temporary buffer.
Resolve by adjusting buffer sizes.
Such as:git/pktgen-dpdk/app/pktgen-capture.c: In function ‘pktgen_set_capture’:git/pktgen-dpdk/app/pktgen-log.h:114:3: error: ‘strncat’ output may be truncated copying between 0 and 255 bytes from a string of length 1022 [-Werror=stringop-truncation]
strncat(dest, _buff, sizeof(dest) - strlen(dest) - 1); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~git/pktgen-dpdk/app/pktgen-capture.c:246:7: note: in expansion of macro ‘strncatf’
strncatf(status, "%d%%", pct);
^~~~~~~~cc1: all warnings being treated as errors
Signed-off-by Stephen Hemminger <[email protected]>
--- app/pktgen-capture.c | 2 +- app/pktgen-log.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
app/pktgen-capture.c +1 -1
@@ -200,7 +200,7 @@ found_rx_lid:size_t mem_dumped =0 ;unsigned int pct =0 ; -char status[256 ]; +char status[1024 ]; sprintf( status, "\r Dumping ~%.2fMB of captured data to disk: 0%%",
app/pktgen-log.h +5 -5
@@ -108,11 +108,11 @@ extern "C" {* arguments. It formats the string and appends it to the existing string, while * avoiding possible buffer overruns. */ -#define strncatf (dest, fmt, ...) do { \ - char _buff[1024]; \ - snprintf(_buff, sizeof(_buff), fmt, ## __VA_ARGS__); \ - strncat(dest, _buff, sizeof(dest) - strlen(dest) - 1); \ -} while (0) +#define strncatf (dest, fmt, ...) do { \ + char _buff[1023]; \ + snprintf(_buff, sizeof(_buff), fmt, ## __VA_ARGS__); \ + strncat(dest, _buff, sizeof(dest) - strlen(dest) - 1); \ + } while (0)/* Initialize log data structures */ void pktgen_init_log (void );
Signature · 1 line
2.20.1