Merge branch 'ab/mailmap-leakfix'

gitster · gitster · commit f0b567898b08 · 2021-09-10T11:46:28.000-07:00
Leakfix.

* ab/mailmap-leakfix:
  mailmap.c: fix a memory leak in free_mailap_{info,entry}()
diff --git a/mailmap.c b/mailmap.c
@@ -37,6 +37,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)
@@ -52,6 +53,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
`@@ -37,6 +37,7 @@ static void free_mailmap_info(void p, const char s)`
`37`	`37`	`s, debug_str(mi->name), debug_str(mi->email));`
`38`	`38`	`free(mi->name);`
`39`	`39`	`free(mi->email);`
	`40`	`+ free(mi);`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`static void free_mailmap_entry(void p, const char s)`
`@@ -52,6 +53,7 @@ static void free_mailmap_entry(void p, const char s)`
`52`	`53`
`53`	`54`	`me->namemap.strdup_strings = 1;`
`54`	`55`	`string_list_clear_func(&me->namemap, free_mailmap_info);`
	`56`	`+ free(me);`
`55`	`57`	`}`
`56`	`58`
`57`	`59`	`/*`