ui-ssdiff: ban strncat()

[ps-cgit] / ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index b6dc5b0578ba68589a4eba8b38d47c27b5012db4..af8bc9e0659bff07c1cf51733ef15b4cd37ea990 100644 (file)
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -117,7 +117,7 @@ static char *replace_tabs(char *line)
        int n_tabs = 0;
        int i;
        char *result;
        int n_tabs = 0;
        int i;
        char *result;

-       int result_len;
+       size_t result_len;

 
        if (linelen == 0) {
                result = xmalloc(1);
 
        if (linelen == 0) {
                result = xmalloc(1);


@@ -136,10 +136,12 @@ static char *replace_tabs(char *line)
        for (;;) {
                cur_buf = strchr(prev_buf, '\t');
                if (!cur_buf) {
        for (;;) {
                cur_buf = strchr(prev_buf, '\t');
                if (!cur_buf) {

-                       strncat(result, prev_buf, result_len);
+                       linelen = strlen(result);
+                       strlcpy(&result[linelen], prev_buf, result_len - linelen + 1);

                        break;
                } else {
                        break;
                } else {

-                       strncat(result, prev_buf, cur_buf - prev_buf);
+                       linelen = strlen(result);
+                       strlcpy(&result[linelen], prev_buf, cur_buf - prev_buf + 1);

                        linelen = strlen(result);
                        memset(&result[linelen], ' ', 8 - (linelen % 8));
                        result[linelen + 8 - (linelen % 8)] = '\0';
                        linelen = strlen(result);
                        memset(&result[linelen], ' ', 8 - (linelen % 8));
                        result[linelen + 8 - (linelen % 8)] = '\0';