Re: [PATCH] Avoid segfault in diff --stat rename output.
- From
Junio C Hamano <junkio@cox.net>
- Date
- May 23, 2006, 01:02 UTC
- Message-ID
- <7vzmh98seo.fsf@assigned-by-dhcp.cox.net>
- In-Reply-To
- <BAYC1-PASMTP115C9137E5BDABD705881BAE9B0@CEZ.ICE>
Sean <seanlkml@sympatico.ca> writes:
Show 16 quoted lines
> Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
> ---
> diff.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/diff.c b/diff.c
> index 7f35e59..a7bb9b9 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -237,7 +237,7 @@ static char *pprint_rename(const char *a
> 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);
> + name = xmalloc(pfx_length + a_midlen + b_midlen + sfx_length + 7);
> sprintf(name, "%.*s{%.*s => %.*s}%s",Obviously correct given what the sprintf() that immediately follows does. Sheesh, what was I smoking back then. *BLUSH*
Thanks.