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

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

[Lidong Yan via GitGitGadget]

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

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

[Patrick Steinhardt]

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

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

[Junio C Hamano]

"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.