# [PATCH] Fix memory leak in submodule.c 2 messages from 2010-01-31 to 2010-01-31. Participants: Jens Lehmann, Junio C Hamano. Thread: https://gitlist.dev/t/22460 ## Jens Lehmann, 2010-01-31 16:43 Subject: [PATCH] Fix memory leak in submodule.c Message-ID: <4B65B345.1090907@web.de> URL: https://gitlist.dev/e/4B65B345.1090907%40web.de ``` The strbuf used in add_submodule_odb() was never released. So for every submodule - populated or not - we leaked its object directory name when using "git diff*" with the --submodule option. Signed-off-by: Jens Lehmann --- submodule.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/submodule.c b/submodule.c index 6f7c210..7d70c4f 100644 --- a/submodule.c +++ b/submodule.c @@ -10,17 +10,19 @@ static int add_submodule_odb(const char *path) { struct strbuf objects_directory = STRBUF_INIT; struct alternate_object_database *alt_odb; + int ret = 0; strbuf_addf(&objects_directory, "%s/.git/objects/", path); - if (!is_directory(objects_directory.buf)) - return -1; - + if (!is_directory(objects_directory.buf)) { + ret = -1; + goto done; + } /* avoid adding it twice */ for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next) if (alt_odb->name - alt_odb->base == objects_directory.len && !strncmp(alt_odb->base, objects_directory.buf, objects_directory.len)) - return 0; + goto done; alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb)); alt_odb->next = alt_odb_list; @@ -31,7 +33,9 @@ static int add_submodule_odb(const char *path) alt_odb->name[41] = '\0'; alt_odb_list = alt_odb; prepare_alt_odb(); - return 0; +done: + strbuf_release(&objects_directory); + return ret; } void show_submodule_summary(FILE *f, const char *path, -- 1.7.0.rc1.141.gd3fd.dirty ``` ## Junio C Hamano, 2010-01-31 19:23 Subject: Re: [PATCH] Fix memory leak in submodule.c Message-ID: <7vaavudqnk.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vaavudqnk.fsf%40alter.siamese.dyndns.org In-Reply-To: <4B65B345.1090907@web.de> ``` Thanks. ```