ui-ssdiff: ban strcat() Git upstream bans strcat() with commit: banned.h: mark strcat() as banned 1b11b64b815db62f93a04242e4aed5687a448748 Signed-off-by: Christian Hesse <mail@eworm.de>
Christian Hesse mail@eworm.de
Tue, 28 Aug 2018 18:23:36 +0200
1 files changed,
4 insertions(+),
2 deletions(-)
jump to
M
ui-ssdiff.c
→
ui-ssdiff.c
@@ -117,6 +117,7 @@ size_t linelen = strlen(line);
int n_tabs = 0; int i; char *result; + int result_len; if (linelen == 0) { result = xmalloc(1);@@ -128,13 +129,14 @@ for (i = 0; i < linelen; i++) {
if (line[i] == '\t') n_tabs += 1; } - result = xmalloc(linelen + n_tabs * 8 + 1); + result_len = linelen + n_tabs * 8; + result = xmalloc(result_len + 1); result[0] = '\0'; for (;;) { cur_buf = strchr(prev_buf, '\t'); if (!cur_buf) { - strcat(result, prev_buf); + strncat(result, prev_buf, result_len); break; } else { strncat(result, prev_buf, cur_buf - prev_buf);