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>
Jeff King committed
Apr 30, 2008 at 00:13 UTC
861f00e3496fd5cd866a73f11826dfc8822a5195
1 file changed
+5
-2
sha1_name.c
+5
-2
@@ -352,8 +352,11 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
352
}
353
if (0 <= nth)
354
at_time = 0;
355
- else
356
- at_time = approxidate(str + at + 2);
355
+ else {
356
+ char *tmp = xstrndup(str + at + 2, reflog_len);
357
+ at_time = approxidate(tmp);
358
+ free(tmp);
359
+ }
360
if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
361
&co_time, &co_tz, &co_cnt)) {
362
if (at_time)