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

Fix memory leak in submodule.c 

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 <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jens Lehmann 2010-01-31 17:43:49 +01:00 committed by Junio C Hamano
parent 6a5d0b0a90
commit de7a79608c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
submodule.c
View File

@ -10,17 +10,19 @@ static int add_submodule_odb(const char *path)
{ {
struct strbuf objects_directory = STRBUF_INIT; struct strbuf objects_directory = STRBUF_INIT;
struct alternate_object_database *alt_odb; struct alternate_object_database *alt_odb;
int ret = 0;


strbuf_addf(&objects_directory, "%s/.git/objects/", path); strbuf_addf(&objects_directory, "%s/.git/objects/", path);
if (!is_directory(objects_directory.buf)) if (!is_directory(objects_directory.buf)) {
return -1; ret = -1;

goto done;
}
/* avoid adding it twice */ /* avoid adding it twice */
for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next) for (alt_odb = alt_odb_list; alt_odb; alt_odb = alt_odb->next)
if (alt_odb->name - alt_odb->base == objects_directory.len && if (alt_odb->name - alt_odb->base == objects_directory.len &&
!strncmp(alt_odb->base, objects_directory.buf, !strncmp(alt_odb->base, objects_directory.buf,
objects_directory.len)) objects_directory.len))
return 0; goto done;


alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb)); alt_odb = xmalloc(objects_directory.len + 42 + sizeof(*alt_odb));
alt_odb->next = alt_odb_list; 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->name[41] = '\0';
alt_odb_list = alt_odb; alt_odb_list = alt_odb;
prepare_alt_odb(); prepare_alt_odb();
return 0; done:
strbuf_release(&objects_directory);
return ret;
} }


void show_submodule_summary(FILE *f, const char *path, void show_submodule_summary(FILE *f, const char *path,