kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ds/commit-graph-incremental' 

Leakfix.

* ds/commit-graph-incremental:
  commit-graph: release strbufs after use
maint
Junio C Hamano 2019-08-09 10:13:13 -07:00
parent c2a8c3701b 0aa6bce736
commit 203cf46fac
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
commit-graph.c
View File

@ -434,6 +434,7 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const


free(oids); free(oids);
fclose(fp); fclose(fp);
strbuf_release(&line);


return graph_chain; return graph_chain;
} }
@ -1186,7 +1187,7 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
} }


stop_progress(&ctx->progress); stop_progress(&ctx->progress);
strbuf_reset(&progress_title); strbuf_release(&progress_title);
strbuf_release(&packname); strbuf_release(&packname);


return 0; return 0;
@ -1713,10 +1714,8 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
strbuf_addstr(&path, "/info/commit-graphs"); strbuf_addstr(&path, "/info/commit-graphs");
dir = opendir(path.buf); dir = opendir(path.buf);


if (!dir) { if (!dir)
strbuf_release(&path); goto out;
return;
}


strbuf_addch(&path, '/'); strbuf_addch(&path, '/');
dirnamelen = path.len; dirnamelen = path.len;
@ -1745,6 +1744,9 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
if (!found) if (!found)
unlink(path.buf); unlink(path.buf);
} }

out:
strbuf_release(&path);
} }


int write_commit_graph(const char *obj_dir, int write_commit_graph(const char *obj_dir,