Hi Peff
On 25/04/2023 06:54, Jeff King wrote:
The comment in parse_commit_date() claims that parse_timestamp() will
not walk past the end of the buffer we've been given, since it will hit
the newline at "eol" and stop. This is usually true, when dateptr
contains actual numbers to parse. But with a line like:
committer name <email> \n
with just whitespace, and no numbers, parse_timestamp() will consume
that newline as part of the leading whitespace, and we may walk past our
"tail" pointer (which itself is set from the "size" parameter passed in
to parse_commit_buffer()).
In practice this can't cause us to walk off the end of an array, because
we always add an extra NUL byte to the end of objects we load from disk
(as a defense against exactly this kind of bug). However, you can see
the behavior in action when "committer" is the final header (which it
usually is, unless there's an encoding) and the subject line can be
parsed as an integer. We walk right past the newline on the committer
line, as well as the "\n\n" separator, and mistake the subject for the
timestamp.
The new test demonstrates such a case. I also added a test to check this
case against the pretty-print formatter, which uses split_ident_line().
It's not subject to the same bug, because it insists that there be one
or more digits in the timestamp.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
commit.c | 17 +++++++++++++++--
t/t4212-log-corrupt.sh | 29 +++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/commit.c b/commit.c
index bb340f66fa..2f1b5d505b 100644
--- a/commit.c
+++ b/commit.c
@@ -120,10 +120,23 @@ static timestamp_t parse_commit_date(const char *buf, const char *tail)
dateptr = eol;
while (dateptr > buf && dateptr[-1] != '>')
dateptr--;
- if (dateptr == buf || dateptr == eol)
+ if (dateptr == buf)
return 0;
- /* dateptr < eol && *eol == '\n', so parsing will stop at eol */
+ /*
+ * Trim leading whitespace; parse_timestamp() will do this itself, but
+ * if we have _only_ whitespace, it will walk right past the newline
+ * while doing so.
+ */
+ while (dateptr < eol && isspace(*dateptr))
+ dateptr++;
+ if (dateptr == eol)
+ return 0;
+
+ /*
+ * We know there is at least one non-whitespace character, so we'll
+ * begin parsing there and stop at worst case at eol.
+ */
This probably doesn't matter in practice but we define our own isspace()
that does not treat '\v' and '\f' as whitespace. However
parse_timestamp() (which is just strtoumax()) uses the standard
library's isspace() which does treat those characters as whitespace and
is locale dependent. This means we can potentially stop at a character
that parse_timestamp() treats as whitespace and if there are no digits
after it we'll still walk past the end of the line. Using Rene's
suggestion of testing the character with isdigit() would fix that. It
would also avoid parsing negative timestamps as positive numbers and
reject any timestamps that begin with a locale dependent digit.
I'm not familiar with this code, but would it be worth changing
parse_timestamp() to stop parsing if it sees a newline?
Best Wishes
Phillip
return parse_timestamp(dateptr, NULL, 10);
}
diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh
index af4b35ff56..d4ef48d646 100755
--- a/t/t4212-log-corrupt.sh
+++ b/t/t4212-log-corrupt.sh
@@ -92,4 +92,33 @@ test_expect_success 'absurdly far-in-future date' '
git log -1 --format=%ad $commit
'
+test_expect_success 'create commit with whitespace committer date' '
+ # It is important that this subject line is numeric, since we want to
+ # be sure we are not confused by skipping whitespace and accidentally
+ # parsing the subject as a timestamp.
+ #
+ # Do not use munge_author_date here. Besides not hitting the committer
+ # line, it leaves the timezone intact, and we want nothing but
+ # whitespace.
+ test_commit 1234567890 &&
+ git cat-file commit HEAD >commit.orig &&
+ sed "s/>.*/> /" <commit.orig >commit.munge &&
+ ws_commit=$(git hash-object --literally -w -t commit commit.munge)
+'
+
+test_expect_success '--until treats whitespace date as sentinel' '
+ echo $ws_commit >expect &&
+ git rev-list --until=1980-01-01 $ws_commit >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty-printer handles whitespace date' '
+ # as with the %ad test above, we will show these as the empty string,
+ # not the 1970 epoch date. This is intentional; see 7d9a281941 (t4212:
+ # test bogus timestamps with git-log, 2014-02-24) for more discussion.
+ echo : >expect &&
+ git log -1 --format="%at:%ct" $ws_commit >actual &&
+ test_cmp expect actual
+'
+
test_done
