diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-03 09:14:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-03 09:15:00 -0700 |
| commit | 8c1c63d5256edd900200b7f056a946f38c89495d (patch) | |
| tree | 5a894009e6419ca2ba29ba2031067b457f8bfaba /mailinfo.c | |
| parent | f123c19e72190e666fbcd827924fd1f090a9d6ae (diff) | |
| parent | 13b23d2da552b9476a0025562bc4ab8954d5be45 (diff) | |
| download | git-8c1c63d5256edd900200b7f056a946f38c89495d.tar.gz | |
Merge branch 'ps/leakfixes-part-5'
Even more leak fixes.
* ps/leakfixes-part-5:
transport: fix leaking negotiation tips
transport: fix leaking arguments when fetching from bundle
builtin/fetch: fix leaking transaction with `--atomic`
remote: fix leaking peer ref when expanding refmap
remote: fix leaks when matching refspecs
remote: fix leaking config strings
builtin/fetch-pack: fix leaking refs
sideband: fix leaks when configuring sideband colors
builtin/send-pack: fix leaking refspecs
transport: fix leaking OID arrays in git:// transport data
t/helper: fix leaking multi-pack-indices in "read-midx"
builtin/repack: fix leaks when computing packs to repack
midx-write: fix leaking hashfile on error cases
builtin/archive: fix leaking `OPT_FILENAME()` value
builtin/upload-archive: fix leaking args passed to `write_archive()`
builtin/merge-tree: fix leaking `-X` strategy options
pretty: fix leaking key/value separator buffer
pretty: fix memory leaks when parsing pretty formats
convert: fix leaks when resetting attributes
mailinfo: fix leaking header data
Diffstat (limited to 'mailinfo.c')
| -rw-r--r-- | mailinfo.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/mailinfo.c b/mailinfo.c index 95228531a6..ce1455f943 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -1292,8 +1292,21 @@ void clear_mailinfo(struct mailinfo *mi) strbuf_release(&mi->inbody_header_accum); free(mi->message_id); - strbuf_list_free(mi->p_hdr_data); - strbuf_list_free(mi->s_hdr_data); + for (size_t i = 0; header[i]; i++) { + if (!mi->p_hdr_data[i]) + continue; + strbuf_release(mi->p_hdr_data[i]); + free(mi->p_hdr_data[i]); + } + free(mi->p_hdr_data); + + for (size_t i = 0; header[i]; i++) { + if (!mi->s_hdr_data[i]) + continue; + strbuf_release(mi->s_hdr_data[i]); + free(mi->s_hdr_data[i]); + } + free(mi->s_hdr_data); while (mi->content < mi->content_top) { free(*(mi->content_top)); |