summaryrefslogtreecommitdiff
path: root/t/t4253-am-keep-cr-dos.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2020-01-25 00:39:29 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-01-28 23:13:25 -0800
commit3cd309c16f3b9370a90d2f4eb69002473020412a (patch)
tree465de16ad57bb5477586d3b7b5ebdf600ddd26b3 /t/t4253-am-keep-cr-dos.sh
parentavoid computing zero offsets from NULL pointer (diff)
downloadtgif-3cd309c16f3b9370a90d2f4eb69002473020412a.tar.xz
xdiff: avoid computing non-zero offset from NULL pointer
As with the previous commit, clang-11's UBSan complains about computing offsets from a NULL pointer, causing some tests to fail. In this case, though, we're actually computing a non-zero offset, which is even more dubious. From t7810: xdiff-interface.c:268:14: runtime error: applying non-zero offset 1 to null pointer ... not ok 131 - grep -p with userdiff The problem is our parsing of the funcname config. We count the number of lines in the string, allocate an array, and then loop over our allocated entries, parsing each line and moving our cursor to one past the trailing newline for the next iteration. But the final line will not generally have a trailing newline (since it's a config value), and hence we go to one past NULL. In practice this is OK, since our loop should terminate before we look at the value. But even computing such an invalid pointer technically violates the standard. We can fix it by leaving the pointer at NULL if we're at the end, rather than one-past. And while we're thinking about it, we can also document the variant by asserting that our initial line-count matches the second-pass of parsing. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4253-am-keep-cr-dos.sh')
0 files changed, 0 insertions, 0 deletions