diff options
| author | Christian Hesse <mail@eworm.de> | 2018-08-28 19:23:36 +0300 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2018-09-11 09:47:12 +0300 |
| commit | a96f2890f41e0b9b0ffa1bcdb1dddbef28c01662 (patch) | |
| tree | d88340d58313c6f20e063003d809e158c7295c29 | |
| parent | 0899eb644fab415e9a3b304f53da9da50aaf91aa (diff) | |
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>
| -rw-r--r-- | ui-ssdiff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ui-ssdiff.c b/ui-ssdiff.c index a3dd059..c456033 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -117,6 +117,7 @@ static char *replace_tabs(char *line) int n_tabs = 0; int i; char *result; + int result_len; if (linelen == 0) { result = xmalloc(1); @@ -128,13 +129,14 @@ static char *replace_tabs(char *line) 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); |