summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-base.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2014-03-07 12:15:01 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-07 11:53:29 -0800
commit3f419d45ef0dfc33dc301d9ae4737043c091291a (patch)
treee72175e8040f851f4e567ad6db3965ce24c13ece /Documentation/git-merge-base.txt
parentlog: do not segfault on gmtime errors (diff)
downloadtgif-3f419d45ef0dfc33dc301d9ae4737043c091291a.tar.xz
show_ident_date: fix tz range check
Commit 1dca155fe3fa (log: handle integer overflow in timestamps, 2014-02-24) tried to catch integer overflow coming from strtol() on the timezone field by comparing against LONG_MIN/LONG_MAX. However, the intermediate "tz" variable is an "int", which means it can never be LONG_MAX on LP64 systems; we would truncate the output from strtol before the comparison. Clang's -Wtautological-constant-out-of-range-compare notices this and rightly complains. Let's instead store the result of strtol in a long, and then compare it against INT_MIN/INT_MAX. This will catch overflow from strtol, and also overflow when we pass the result as an int to show_date. Reported-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions