summaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-04-30 04:13:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-30 05:22:19 (GMT)
commit861f00e3496fd5cd866a73f11826dfc8822a5195 (patch)
treeb651073ae4a7e7f005c2016498d614f61cf3b7b3 /sha1_name.c
parent362b0dd523f5162e7c55c76b5d0af7ad830e0e83 (diff)
downloadgit-861f00e3496fd5cd866a73f11826dfc8822a5195.zip
git-861f00e3496fd5cd866a73f11826dfc8822a5195.tar.gz
git-861f00e3496fd5cd866a73f11826dfc8822a5195.tar.bz2
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>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sha1_name.c b/sha1_name.c
index 6c9c1c7..6298c37 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)