summaryrefslogtreecommitdiff
path: root/Documentation/git-show-branch.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2019-07-23 15:27:05 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-23 14:26:13 -0700
commitb777f3fd619ac2af507ffd3e7c5fe0d6e36e81f2 (patch)
tree0be222928f3e25c6170f8cc09dc6ebfe67910090 /Documentation/git-show-branch.txt
parentGit 2.20.1 (diff)
downloadtgif-b777f3fd619ac2af507ffd3e7c5fe0d6e36e81f2.tar.xz
xdiff: clamp function context indices in post-image
After finding a function line for --function-context in the pre-image, xdl_emit_diff() calculates the equivalent line in the post-image. It assumes that the lines between changes are the same on both sides. If the option --ignore-blank-lines was also given then this is not necessarily true. Clamp the calculation results for start and end of the function context to prevent out-of-bounds array accesses. Note that this _just_ fixes the case where our mismatch sends us off the beginning of the file. There are likely other cases where our assumption causes us to go to the wrong line within the file. Nobody has developed a test case yet, and the ultimate fix is likely more complicated than this patch. But this at least prevents a segfault in the meantime. Credit for finding the bug goes to "Liu Wei of Tencent Security Xuanwu Lab". Reported-by: 刘炜 <lw17qhdz@gmail.com> Helped-by: René Scharfe <l.s.r@web.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-show-branch.txt')
0 files changed, 0 insertions, 0 deletions