mailmap.c: fix a memory leak in free_mailap_{info,entry}()

avar · gitster · commit ccdd5d1eb14a · 2021-08-31T12:38:09.000-07:00
In the free_mailmap_entry() code added in 0925ce4 (Add map_user() and clear_mailmap() to mailmap, 2009-02-08) the intent was clearly to clear the "me" structure, but while we freed parts of the mailmap_entry structure, we didn't free the structure itself. The same goes for the "mailmap_info" structure. This brings the number of SANITIZE=leak failures in t4203-mailmap.sh down from 50 to 49. Not really progress as far as the number of failures is concerned, but as far as I can tell this fixes all leaks in mailmap.c itself. There's still users of it such as builtin/log.c that call read_mailmap() without a clear_mailmap(), but that's on them. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/mailmap.c b/mailmap.c
@@ -36,6 +36,7 @@ static void free_mailmap_info(void *p, const char *s)
 		 s, debug_str(mi->name), debug_str(mi->email));
 	free(mi->name);
 	free(mi->email);
+	free(mi);
 }
 
 static void free_mailmap_entry(void *p, const char *s)
@@ -51,6 +52,7 @@ static void free_mailmap_entry(void *p, const char *s)
 
 	me->namemap.strdup_strings = 1;
 	string_list_clear_func(&me->namemap, free_mailmap_info);
+	free(me);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ static void free_mailmap_info(void p, const char s)`
`36`	`36`	`s, debug_str(mi->name), debug_str(mi->email));`
`37`	`37`	`free(mi->name);`
`38`	`38`	`free(mi->email);`
	`39`	`+ free(mi);`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`static void free_mailmap_entry(void p, const char s)`
`@@ -51,6 +52,7 @@ static void free_mailmap_entry(void p, const char s)`
`51`	`52`
`52`	`53`	`me->namemap.strdup_strings = 1;`
`53`	`54`	`string_list_clear_func(&me->namemap, free_mailmap_info);`
	`55`	`+ free(me);`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`/*`