diff options
| author |  Jeff King <peff@peff.net> | 2008-04-30 00:13:58 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-04-29 22:22:19 -0700 |
| commit | 861f00e3496fd5cd866a73f11826dfc8822a5195 (patch) | |
| tree | b651073ae4a7e7f005c2016498d614f61cf3b7b3 | |
| parent | Remove 'header' from --signoff option description (diff) | |
| download | tgif-861f00e3496fd5cd866a73f11826dfc8822a5195.tar.xz | |
fix reflog approxidate parsing bug
In get_sha1_basic, we parse a string like
HEAD@{10 seconds ago}:path/to/file
into its constituent ref, reflog date, and path components.
We never actually munge the string itself, but instead keep
offsets into the string with their associated lengths.
When we call approxidate on the contents inside braces,
however, we pass just a string without a length. This means
that approxidate could sometimes look past the closing brace
and (erroneously) interpret the rest of the string as part
of the date.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sha1_name.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c index 6c9c1c75ad..6298c37ae3 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -352,8 +352,11 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1) } if (0 <= nth) at_time = 0; - else - at_time = approxidate(str + at + 2); + else { + char *tmp = xstrndup(str + at + 2, reflog_len); + at_time = approxidate(tmp); + free(tmp); + } if (read_ref_at(real_ref, at_time, nth, sha1, NULL, &co_time, &co_tz, &co_cnt)) { if (at_time) |