mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/format-patch-message-id-unleak'

Browse Source 
Leakfix.

* jk/format-patch-message-id-unleak:
  format-patch: free elements of rev.ref_message_ids list
  format-patch: free rev.message_id when exiting
This commit is contained in:
Junio C Hamano
2023-06-13 12:29:46 -07:00
parent cbc882ea38 c6d26a9dda
commit e490bea8a6
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/log.c
View File

@ -1406,7 +1406,7 @@ static void make_cover_letter(struct rev_info *rev, int use_separate_file,
} }
} }
static const char *clean_message_id(const char *msg_id) static char *clean_message_id(const char *msg_id)
{ {
char ch; char ch;
const char *a, *z, *m; const char *a, *z, *m;
@ -1424,7 +1424,7 @@ static const char *clean_message_id(const char *msg_id)
if (!z) if (!z)
die(_("insane in-reply-to: %s"), msg_id); die(_("insane in-reply-to: %s"), msg_id);
if (++z == m) if (++z == m)
return a; return xstrdup(a);
return xmemdupz(a, z - a); return xmemdupz(a, z - a);
} }
@ -2310,11 +2310,11 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (in_reply_to || thread || cover_letter) { if (in_reply_to || thread || cover_letter) {
rev.ref_message_ids = xmalloc(sizeof(*rev.ref_message_ids)); rev.ref_message_ids = xmalloc(sizeof(*rev.ref_message_ids));
string_list_init_nodup(rev.ref_message_ids); string_list_init_dup(rev.ref_message_ids);
} }
if (in_reply_to) { if (in_reply_to) {
const char *msgid = clean_message_id(in_reply_to); char *msgid = clean_message_id(in_reply_to);
string_list_append(rev.ref_message_ids, msgid); string_list_append_nodup(rev.ref_message_ids, msgid);
} }
rev.numbered_files = just_numbers; rev.numbered_files = just_numbers;
rev.patch_suffix = fmt_patch_suffix; rev.patch_suffix = fmt_patch_suffix;
@ -2370,7 +2370,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
&& (!cover_letter || rev.nr > 1)) && (!cover_letter || rev.nr > 1))
free(rev.message_id); free(rev.message_id);
else else
string_list_append(rev.ref_message_ids, string_list_append_nodup(rev.ref_message_ids,
rev.message_id); rev.message_id);
} }
gen_message_id(&rev, oid_to_hex(&commit->object.oid)); gen_message_id(&rev, oid_to_hex(&commit->object.oid));
@ -2420,6 +2420,7 @@ done:
strbuf_release(&rdiff_title); strbuf_release(&rdiff_title);
strbuf_release(&sprefix); strbuf_release(&sprefix);
free(to_free); free(to_free);
free(rev.message_id);
if (rev.ref_message_ids) if (rev.ref_message_ids)
string_list_clear(rev.ref_message_ids, 0); string_list_clear(rev.ref_message_ids, 0);
free(rev.ref_message_ids); free(rev.ref_message_ids);

2
t/t9001-send-email.sh
View File

@ -4,7 +4,7 @@ test_description='git send-email'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
# no longer TEST_PASSES_SANITIZE_LEAK=true - format-patch --thread leaks TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
# May be altered later in the test # May be altered later in the test