[PATCH 1/7] init: plug tiny one-time memory leak
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH 1/7] init: plug tiny one-time memory leak · Junio C Hamano <hidden>
The buffer used to construct paths like ".git/objects/info" and ".git/objects/pack" is allocated on the heap and never freed. So free it. While at it, factor out the relevant code into its own function to make it more obvious that this data is not used elsewhere. Noticed by valgrind while setting up tests (in test-lib). Signed-off-by: Jonathan Nieder <redacted> --- builtin/init-db.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 0271285..a9c54ea 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c@@ -294,11 +294,26 @@ static int create_default_files(const char *template_path) return reinit; } +static void create_sha1_dir(void) +{ + const char *sha1_dir = get_object_directory(); + int len = strlen(sha1_dir); + char *path = xmalloc(len + 40); + + memcpy(path, sha1_dir, len); + + safe_create_dir(sha1_dir, 1); + strcpy(path+len, "/pack"); + safe_create_dir(path, 1); + strcpy(path+len, "/info"); + safe_create_dir(path, 1); + + free(path); +} + int init_db(const char *template_dir, unsigned int flags) { - const char *sha1_dir; - char *path; - int len, reinit; + int reinit; safe_create_dir(get_git_dir(), 0);
@@ -313,16 +328,7 @@ int init_db(const char *template_dir, unsigned int flags) reinit = create_default_files(template_dir); - sha1_dir = get_object_directory(); - len = strlen(sha1_dir); - path = xmalloc(len + 40); - memcpy(path, sha1_dir, len); - - safe_create_dir(sha1_dir, 1); - strcpy(path+len, "/pack"); - safe_create_dir(path, 1); - strcpy(path+len, "/info"); - safe_create_dir(path, 1); + create_sha1_dir(); if (shared_repository) { char buf[10];
--
1.7.2.3