diff --color-moved-ws: fix out of bounds string access

When adjusting the start of the string to take account of the change
in indentation the code was not checking that the string being
adjusted was in fact longer than the indentation change. This was
detected by 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>
This commit is contained in:
Phillip Wood 2018-10-04 11:07:42 +01:00 коммит произвёл Junio C Hamano
Родитель 74d156f4a1
Коммит cf074a9b0e
1 изменённых файлов: 1 добавлений и 1 удалений

2
diff.c
Просмотреть файл

@ -865,7 +865,7 @@ static int cmp_in_block_with_wsd(const struct diff_options *o,
al -= wslen;
}
if (strcmp(a, c))
if (al != cl || memcmp(a, c, al))
return 1;
return 0;