git: update to v2.19.1

[ps-cgit] / ui-ssdiff.c

diff --git a/ui-ssdiff.c b/ui-ssdiff.c
index 7f261ed53a0077fa3fd4a8dab3db1fcdcf247a8c..c4560330a9c265a67bc2e65a28d4617b5de74a07 100644 (file)
--- a/ui-ssdiff.c
+++ b/ui-ssdiff.c
@@ -103,8 +103,7 @@ static int line_from_hunk(char *line, char type)
                return 0;
        len = buf2 - buf1;
        buf2 = xmalloc(len + 1);
-       strncpy(buf2, buf1, len);
-       buf2[len] = '\0';
+       strlcpy(buf2, buf1, len + 1);
        res = atoi(buf2);
        free(buf2);
        return res;
@@ -114,11 +113,11 @@ static char *replace_tabs(char *line)
 {
        char *prev_buf = line;
        char *cur_buf;
-       int linelen = strlen(line);
+       size_t linelen = strlen(line);
        int n_tabs = 0;
        int i;
        char *result;
-       char *spaces = "        ";
+       int result_len;
 
        if (linelen == 0) {
                result = xmalloc(1);
@@ -126,20 +125,24 @@ static char *replace_tabs(char *line)
                return result;
        }
 
-       for (i = 0; i < linelen; i++)
+       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';
 
-       while (1) {
+       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);
-                       strncat(result, spaces, 8 - (strlen(result) % 8));
+                       linelen = strlen(result);
+                       memset(&result[linelen], ' ', 8 - (linelen % 8));
+                       result[linelen + 8 - (linelen % 8)] = '\0';
                }
                prev_buf = cur_buf + 1;
        }