mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'db/date-underflow-fix'

Browse Source 
date parser updates to be more careful about underflowing epoch
based timestamp.

* db/date-underflow-fix:
  date: detect underflow/overflow when parsing dates with timezone offset
  t0006: simplify prerequisites
This commit is contained in:
Junio C Hamano
2024-07-08 14:53:09 -07:00
parent 4e18cd5ef7 9d69789770
commit 6f75d230a1
2 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
date.c
View File

@ -868,6 +868,10 @@ static int match_object_header_date(const char *date, timestamp_t *timestamp, in
return 0; return 0;
} }
/* timestamp of 2099-12-31T23:59:59Z, including 32 leap days */
static const timestamp_t timestamp_max = (((timestamp_t)2100 - 1970) * 365 + 32) * 24 * 60 * 60 - 1;
/* Gr. strptime is crap for this; it doesn't have a way to require RFC2822 /* Gr. strptime is crap for this; it doesn't have a way to require RFC2822
(i.e. English) day/month names, and it doesn't work correctly with %z. */ (i.e. English) day/month names, and it doesn't work correctly with %z. */
int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset) int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset)
@ -937,8 +941,14 @@ int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset)
} }
} }
if (!tm_gmt) if (!tm_gmt) {
if (*offset > 0 && *offset * 60 > *timestamp)
return -1;
if (*offset < 0 && -*offset * 60 > timestamp_max - *timestamp)
return -1;
*timestamp -= *offset * 60; *timestamp -= *offset * 60;
}
return 0; /* success */ return 0; /* success */
} }

51
t/t0006-date.sh
View File

@ -8,6 +8,11 @@ TEST_PASSES_SANITIZE_LEAK=true
# arbitrary reference time: 2009-08-30 19:20:00 # arbitrary reference time: 2009-08-30 19:20:00
GIT_TEST_DATE_NOW=1251660000; export GIT_TEST_DATE_NOW GIT_TEST_DATE_NOW=1251660000; export GIT_TEST_DATE_NOW
if test_have_prereq TIME_IS_64BIT,TIME_T_IS_64BIT
then
test_set_prereq HAVE_64BIT_TIME
fi
check_relative() { check_relative() {
t=$(($GIT_TEST_DATE_NOW - $1)) t=$(($GIT_TEST_DATE_NOW - $1))
echo "$t -> $2" >expect echo "$t -> $2" >expect
@ -80,14 +85,15 @@ check_show raw "$TIME" '1466000000 -0200'
# arbitrary time absurdly far in the future # arbitrary time absurdly far in the future
FUTURE="5758122296 -0400" FUTURE="5758122296 -0400"
check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" TIME_IS_64BIT,TIME_T_IS_64BIT check_show iso "$FUTURE" "2152-06-19 18:24:56 -0400" HAVE_64BIT_TIME
check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" TIME_IS_64BIT,TIME_T_IS_64BIT check_show iso-local "$FUTURE" "2152-06-19 22:24:56 +0000" HAVE_64BIT_TIME
check_parse() { REQUIRE_64BIT_TIME=
check_parse () {
echo "$1 -> $2" >expect echo "$1 -> $2" >expect
test_expect_${4:-success} "parse date ($1${3:+ TZ=$3})" " test_expect_success $REQUIRE_64BIT_TIME "parse date ($1${3:+ TZ=$3}) -> $2" "
TZ=${3:-$TZ} test-tool date parse '$1' >actual && TZ=${3:-$TZ} test-tool date parse '$1' >actual &&
test_cmp expect actual test_cmp expect actual
" "
} }
@ -117,6 +123,39 @@ check_parse '2008-02-14 20:30:45 -05:00' '2008-02-14 20:30:45 -0500'
check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 -0500' EST5 check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 -0500' EST5
check_parse 'Thu, 7 Apr 2005 15:14:13 -0700' '2005-04-07 15:14:13 -0700' check_parse 'Thu, 7 Apr 2005 15:14:13 -0700' '2005-04-07 15:14:13 -0700'
check_parse '1970-01-01 00:00:00' '1970-01-01 00:00:00 +0000'
check_parse '1970-01-01 00:00:00 +00' '1970-01-01 00:00:00 +0000'
check_parse '1970-01-01 00:00:00 Z' '1970-01-01 00:00:00 +0000'
check_parse '1970-01-01 00:00:00 -01' '1970-01-01 00:00:00 -0100'
check_parse '1970-01-01 00:00:00 +01' bad
check_parse '1970-01-01 00:00:00 +11' bad
check_parse '1970-01-01 00:59:59 +01' bad
check_parse '1970-01-01 01:00:00 +01' '1970-01-01 01:00:00 +0100'
check_parse '1970-01-01 01:00:00 +11' bad
check_parse '1970-01-02 00:00:00 +11' '1970-01-02 00:00:00 +1100'
check_parse '1969-12-31 23:59:59' bad
check_parse '1969-12-31 23:59:59 +00' bad
check_parse '1969-12-31 23:59:59 Z' bad
check_parse '1969-12-31 23:59:59 +11' bad
check_parse '1969-12-31 23:59:59 -11' bad
REQUIRE_64BIT_TIME=HAVE_64BIT_TIME
check_parse '2099-12-31 23:59:59' '2099-12-31 23:59:59 +0000'
check_parse '2099-12-31 23:59:59 +00' '2099-12-31 23:59:59 +0000'
check_parse '2099-12-31 23:59:59 Z' '2099-12-31 23:59:59 +0000'
check_parse '2099-12-31 23:59:59 +01' '2099-12-31 23:59:59 +0100'
check_parse '2099-12-31 23:59:59 -01' bad
check_parse '2099-12-31 23:59:59 -11' bad
check_parse '2099-12-31 23:00:00 -01' bad
check_parse '2099-12-31 22:59:59 -01' '2099-12-31 22:59:59 -0100'
check_parse '2100-00-00 00:00:00' bad
check_parse '2099-12-30 00:00:00 -11' '2099-12-30 00:00:00 -1100'
check_parse '2100-00-00 00:00:00 +00' bad
check_parse '2100-00-00 00:00:00 Z' bad
check_parse '2100-00-00 00:00:00 -11' bad
check_parse '2100-00-00 00:00:00 +11' bad
REQUIRE_64BIT_TIME=
check_approxidate() { check_approxidate() {
echo "$1 -> $2 +0000" >expect echo "$1 -> $2 +0000" >expect
test_expect_${3:-success} "parse approxidate ($1)" " test_expect_${3:-success} "parse approxidate ($1)" "