@matheusbsbs / matheus-bagliano / commits / 3f419d45ef

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>

Jeff King committed Mar 7, 2014 at 12:15 UTC 3f419d45ef0dfc33dc301d9ae4737043c091291a

1 file changed +2 -2

pretty.c

+2 -2

@@ -397,7 +397,7 @@ static const char *show_ident_date(const struct ident_split *ident,

397 enum date_mode mode)

398 {

399 unsigned long date = 0;

400 - int tz = 0;

400 + long tz = 0;

401

402 if (ident->date_begin && ident->date_end)

403 date = strtoul(ident->date_begin, NULL, 10);

@@ -406,7 +406,7 @@ static const char *show_ident_date(const struct ident_split *ident,

406 else {

407 if (ident->tz_begin && ident->tz_end)

408 tz = strtol(ident->tz_begin, NULL, 10);

409 - if (tz == LONG_MAX || tz == LONG_MIN)

409 + if (tz >= INT_MAX || tz <= INT_MIN)

410 tz = 0;

411 }

412 return show_date(date, tz, mode);