@matheusbsbs / matheus-bagliano / commits / b59ec03cb5

tests: demonstrate "show --word-diff --color-moved" regression

Add a failing test which demonstrates a regression in a18d66cefb ("diff.c: free "buf" in diff_words_flush()", 2022-03-04), the regression is discussed in detail in the subsequent commit. With it running `git show --word-diff --color-moved` with SANITIZE=address would emit: ==31191==ERROR: AddressSanitizer: attempting double-free on 0x617000021100 in thread T0: #0 0x49f0a2 in free (git+0x49f0a2) #1 0x9b0e4d in diff_words_flush diff.c:2153:3 #2 0x9aed5d in fn_out_consume diff.c:2354:3 #3 0xe092ab in consume_one xdiff-interface.c:43:9 #4 0xe072eb in xdiff_outf xdiff-interface.c:76:10 #5 0xec7014 in xdl_emit_diffrec xdiff/xutils.c:53:6 [...] 0x617000021100 is located 0 bytes inside of 768-byte region [0x617000021100,0x617000021400) freed by thread T0 here: #0 0x49f0a2 in free (git+0x49f0a2) [...(same stacktrace)...] previously allocated by thread T0 here: #0 0x49f603 in __interceptor_realloc (git+0x49f603) #1 0xde4da4 in xrealloc wrapper.c:126:8 #2 0x995dc5 in append_emitted_diff_symbol diff.c:794:2 #3 0x96c44a in emit_diff_symbol diff.c:1527:3 [...] This was not caught by the test suite because we test `diff --word-diff --color-moved` only so far. Therefore, add a test for `show`, too. Signed-off-by: Michael J Gruber <git@grubix.eu> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael J Gruber committed Mar 17, 2022 at 15:55 UTC b59ec03cb5f69d6a87dce8fc3ccbfd22d8de3c16

1 file changed +7 -1

t/t4015-diff-whitespace.sh

+7 -1

@@ -1622,7 +1622,7 @@ test_expect_success 'cmd option assumes configured colored-moved' '

1622 test_cmp expected actual

1623 '

1624

1625 -test_expect_success 'no effect from --color-moved with --word-diff' '

1625 +test_expect_success 'no effect on diff from --color-moved with --word-diff' '

1626 cat <<-\EOF >text.txt &&

1627 Lorem Ipsum is simply dummy text of the printing and typesetting industry.

1628 EOF

@@ -1636,6 +1636,12 @@ test_expect_success 'no effect from --color-moved with --word-diff' '

1636 test_cmp expect actual

1637 '

1638

1639 +test_expect_failure 'no effect on show from --color-moved with --word-diff' '

1640 + git show --color-moved --word-diff >actual &&

1641 + git show --word-diff >expect &&

1642 + test_cmp expect actual

1643 +'

1644 +

1645 test_expect_success 'set up whitespace tests' '

1646 git reset --hard &&

1647 # Note that these lines have no leading or trailing whitespace.