X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diff.c;h=5285c0366738a9a6ff8fd116f74da099a5da2ae4;hb=49e3343c9fe0e134e0a8c1ec0ddeb64ae18ee9fd;hp=7a7b839e56ac1ba2ed0b770a047aaf07bce23722;hpb=143f4d94c6e2188a6bedfdfa268e66b579e3fbf9;p=git.git diff --git a/diff.c b/diff.c index 7a7b839e..5285c036 100644 --- a/diff.c +++ b/diff.c @@ -232,11 +232,16 @@ static char *pprint_rename(const char *a, const char *b) * name-a => name-b */ if (pfx_length + sfx_length) { + int a_midlen = len_a - pfx_length - sfx_length; + int b_midlen = len_b - pfx_length - sfx_length; + if (a_midlen < 0) a_midlen = 0; + if (b_midlen < 0) b_midlen = 0; + name = xmalloc(len_a + len_b - pfx_length - sfx_length + 7); sprintf(name, "%.*s{%.*s => %.*s}%s", pfx_length, a, - len_a - pfx_length - sfx_length, a + pfx_length, - len_b - pfx_length - sfx_length, b + pfx_length, + a_midlen, a + pfx_length, + b_midlen, b + pfx_length, a + len_a - sfx_length); } else {