Re: [PATCH] Fix memory leak in function handle_content_type
From: Lidong Yan <hidden>
Date: 2025-06-15 12:55:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2025-06-16 · Re: [PATCH] Fix memory leak in function handle_content_type · Junio C Hamano <hidden>
- 2025-06-14 · Re: [PATCH] Fix memory leak in function handle_content_type · Junio C Hamano <hidden>
- 2025-06-13 · Re: [PATCH] Fix memory leak in function handle_content_type · Jinyao Guo <hidden>
- 2025-06-13 · Re: [PATCH] Fix memory leak in function handle_content_type · Kristoffer Haugsbakk <hidden>
- 2025-06-13 · [PATCH] Fix memory leak in function handle_content_type · Alex via GitGitGadget <hidden>
Jinyao Guo [off-list ref] writes：
quoted hunk ↗ jump to hunk
Sure. I'll choose one account and use it consistently. Here is the edited patch: From 04b286cb2e736c3a53287b6ddf406e704f19fb2e Mon Sep 17 00:00:00 2001 From: jinyaoguo <redacted> Date: Thu, 12 Jun 2025 18:48:24 -0400 Subject: [PATCH] Fix memory leak in function handle_content_type The function handle_content_type allocates memory for boundary using xmalloc(sizeof(struct strbuf)). If (++mi->content_top >= &mi->content[MAX_BOUNDARIES]) is true, the function returns without freeing boundary. Signed-off-by: jinyaoguo <redacted> --- mailinfo.c | 3 +++ 1 file changed, 3 insertions(+)diff --git a/mailinfo.c b/mailinfo.c index ee4597da6b..e0ea358311 100644 --- a/mailinfo.c +++ b/mailinfo.c@@ -266,6 +266,9 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line)error("Too many boundaries to handle"); mi->input_error = -1; mi->content_top = &mi->content[MAX_BOUNDARIES] - 1; + strbuf_release(boundary); + free(boundary); + boundary = NULL; return; } *(mi->content_top) = boundary; -- 2.34.1
May be using goto here would be better. Like: ---
diff --git a/mailinfo.c b/mailinfo.c
index ee4597da6b..83358b7517 100644
--- a/mailinfo.c
+++ b/mailinfo.c@@ -266,13 +266,14 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line) error("Too many boundaries to handle"); mi->input_error = -1; mi->content_top = &mi->content[MAX_BOUNDARIES] - 1; - return; + goto out; } *(mi->content_top) = boundary; boundary = NULL; } slurp_attr(line->buf, "charset=", &mi->charset); +out: if (boundary) { strbuf_release(boundary); free(boundary);
— Lidong