@matheusbsbs / matheus-bagliano / commits / 8aae3cf755

reflog-walk: don't free reflogs added to cache

The add_reflog_for_walk() function keeps a cache mapping refnames to their reflog contents. We use a cached reflog entry if available, and otherwise allocate and store a new one. Since 5026b47175 (add_reflog_for_walk: avoid memory leak, 2017-05-04), when we hit an error parsing a date-based reflog spec, we free the reflog memory but leave the cache entry pointing to the now-freed memory. We can fix this by just leaving the memory intact once it has made it into the cache. This may leave an unused entry in the cache, but that's OK. And it means we also catch a similar situation: we may not have allocated at all in this invocation, but simply be pointing to a cached entry from a previous invocation (which is relying on that entry being present). The new test in t1411 exercises this case and fails when run with --valgrind or ASan. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jul 7, 2017 at 04:41 UTC 8aae3cf7558f00cf3c05636f888cb11e5e548e51

2 files changed +4 -4

reflog-walk.c

-4

@@ -215,10 +215,6 @@ int add_reflog_for_walk(struct reflog_walk_info *info,

215 if (recno < 0) {

216 commit_reflog->recno = get_reflog_recno_by_time(reflogs, timestamp);

217 if (commit_reflog->recno < 0) {

218 - if (reflogs) {

219 - free(reflogs->ref);

220 - free(reflogs);

221 - }

218 free(commit_reflog);

219 return -1;

220 }

t/t1411-reflog-show.sh

@@ -177,4 +177,8 @@ test_expect_success 'showing multiple reflogs works' '

177 git log -g HEAD HEAD >actual

178 '

179

180 +test_expect_success 'showing multiple reflogs with an old date' '

181 + git log -g HEAD@{1979-01-01} HEAD >actual

182 +'

183 +

184 test_done