kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

diff --color-moved-ws: fix a memory leak 

Don't duplicate the indentation string if we're not going to use it.
This was found with asan.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Phillip Wood 2018-10-04 11:07:43 +01:00 committed by Junio C Hamano
parent cf074a9b0e
commit fe4516d103
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diff.c
View File

@ -811,10 +811,13 @@ static int compute_ws_delta(const struct emitted_diff_symbol *a,
const struct emitted_diff_symbol *shorter = a->len > b->len ? b : a;
int d = longer->len - shorter->len;

if (strncmp(longer->line + d, shorter->line, shorter->len))
return 0;

out->string = xmemdupz(longer->line, d);
out->current_longer = (a == longer);

return !strncmp(longer->line + d, shorter->line, shorter->len);
return 1;
}

static int cmp_in_block_with_wsd(const struct diff_options *o,