# [PATCH] builtin/am: fix memory leak in `split_mail_stgit_series`

3 messages from 2025-05-12 to 2025-05-12. Participants: Lidong Yan via GitGitGadget, Patrick Steinhardt, Junio C Hamano.
Thread: https://gitlist.dev/t/63444

## Lidong Yan via GitGitGadget, 2025-05-12 02:07

Subject: [PATCH] builtin/am: fix memory leak in `split_mail_stgit_series`
Message-ID: <pull.1961.git.git.1747015647505.gitgitgadget@gmail.com>
URL: https://gitlist.dev/e/pull.1961.git.git.1747015647505.gitgitgadget%40gmail.com

```
From: Lidong Yan <502024330056@smail.nju.edu.cn>

In builtin/am.c:split_mail_stgit_series, if `fopen` failed,
`series_dir_buf` allocated by `xstrdup` will leak. Add `free` in
`!fp` if branch will prevent the leak.

Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>
---
    builtin/am: fix memory leak in split_mail_stgit_series
    
    In builtin/am.c:split_mail_stgit_series, if fopen failed, series_dir_buf
    allocated by xstrdup will leak. Add free in !fp if branch will prevent
    the leak.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1961%2Fbrandb97%2Ffix-am-leak-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1961/brandb97/fix-am-leak-v1
Pull-Request: https://github.com/git/git/pull/1961

 builtin/am.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builtin/am.c b/builtin/am.c
index 4afb519830f..e32a3b4c973 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -850,8 +850,10 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
 	series_dir = dirname(series_dir_buf);
 
 	fp = fopen(*paths, "r");
-	if (!fp)
+	if (!fp) {
+		free(series_dir_buf);
 		return error_errno(_("could not open '%s' for reading"), *paths);
+	}
 
 	while (!strbuf_getline_lf(&sb, fp)) {
 		if (*sb.buf == '#')

base-commit: 6f84262c44a89851c3ae5a6e4c1a9d06b2068d75
-- 
gitgitgadget

```

## Patrick Steinhardt, 2025-05-12 08:10

Subject: Re: [PATCH] builtin/am: fix memory leak in `split_mail_stgit_series`
Message-ID: <aCGs4nRjjHAs6aYu@pks.im>
URL: https://gitlist.dev/e/aCGs4nRjjHAs6aYu%40pks.im
In-Reply-To: <pull.1961.git.git.1747015647505.gitgitgadget@gmail.com>

```
On Mon, May 12, 2025 at 02:07:27AM +0000, Lidong Yan via GitGitGadget wrote:
> From: Lidong Yan <502024330056@smail.nju.edu.cn>
> 
> In builtin/am.c:split_mail_stgit_series, if `fopen` failed,
> `series_dir_buf` allocated by `xstrdup` will leak. Add `free` in
> `!fp` if branch will prevent the leak.
> 
> Signed-off-by: Lidong Yan <502024330056@smail.nju.edu.cn>

This fix looks obviously correct to me. Thanks!

Patrick

```

## Junio C Hamano, 2025-05-12 14:02

Subject: Re: [PATCH] builtin/am: fix memory leak in `split_mail_stgit_series`
Message-ID: <xmqqikm6vsf3.fsf@gitster.g>
URL: https://gitlist.dev/e/xmqqikm6vsf3.fsf%40gitster.g
In-Reply-To: <pull.1961.git.git.1747015647505.gitgitgadget@gmail.com>

```
"Lidong Yan via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Lidong Yan <502024330056@smail.nju.edu.cn>
>
> In builtin/am.c:split_mail_stgit_series, if `fopen` failed,
> `series_dir_buf` allocated by `xstrdup` will leak. Add `free` in
> `!fp` if branch will prevent the leak.
>
> diff --git a/builtin/am.c b/builtin/am.c
> index 4afb519830f..e32a3b4c973 100644
> --- a/builtin/am.c
> +++ b/builtin/am.c
> @@ -850,8 +850,10 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
>  	series_dir = dirname(series_dir_buf);
>  
>  	fp = fopen(*paths, "r");
> -	if (!fp)
> +	if (!fp) {
> +		free(series_dir_buf);
>  		return error_errno(_("could not open '%s' for reading"), *paths);
> +	}
>  
>  	while (!strbuf_getline_lf(&sb, fp)) {
>  		if (*sb.buf == '#')
>
> base-commit: 6f84262c44a89851c3ae5a6e4c1a9d06b2068d75

Obviously correct; will queue.  Thanks.

```
