path: root/reflog-walk.c
diff options
authorJeff King <>2017-07-07 08:39:50 (GMT)
committerJunio C Hamano <>2017-07-07 15:58:17 (GMT)
commit75afe7ac8728128873c001d82b02ada4a3aa8181 (patch)
tree21581c934949634b9114a7578b3df2a662fbe77a /reflog-walk.c
parent2272d3e5426a65f3fdf456f8e1bfbea40d037a59 (diff)
reflog-walk: duplicate strings in complete_reflogs list
As part of the add_reflog_to_walk() function, we keep a string_list mapping refnames to their reflog contents. This serves as a cache so that accessing the same reflog twice requires only a single copy of the log in memory. The string_list is initialized via xcalloc, meaning its strdup_strings field is set to 0. But after inserting a string into the list, we unconditionally call free() on the string, leaving the list pointing to freed memory. If another reflog is added (e.g., "git log -g HEAD HEAD"), then the second one may have unpredictable results. The extra free was added by 5026b47175 (add_reflog_for_walk: avoid memory leak, 2017-05-04). Though if you look carefully, you can see that the code was buggy even before then. If we tried to read the reflogs by time but came up with no entries, we exited with an error, freeing the string in that code path. So the bug was harder to trigger, but still there. We can fix it by just asking the string list to make a copy of the string. Technically we could fix the problem by not calling free() on our string (and just handing over ownership to the string list), but there are enough conditionals that it's quite hard to figure out which code paths need the free and which do not. Simpler is better here. The new test reliably shows the problem when run with --valgrind or ASAN. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'reflog-walk.c')
1 files changed, 1 insertions, 0 deletions
diff --git a/reflog-walk.c b/reflog-walk.c
index f7ffd1c..aec718b 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -136,6 +136,7 @@ struct reflog_walk_info {
void init_reflog_walk(struct reflog_walk_info **info)
*info = xcalloc(1, sizeof(struct reflog_walk_info));
+ (*info)->complete_reflogs.strdup_strings = 1;
int add_reflog_for_walk(struct reflog_walk_info *info,