[RFC PATCH mtd-utils 012/110] mkfs.ubifs: Fix memleak for 'output' in error paths

From: Zhihao Cheng
Date: Fri Jun 07 2024 - 00:29:06 EST


The 'output' is allocated in get_options(), don't forget to free it
in error paths, move 'output' freeing out of close_target(), which
simplifies the logic of close_target().

Fixes: 36ec51948e0ec ("Add mkfs.ubifs")
Signed-off-by: Zhihao Cheng <chengzhihao1@xxxxxxxxxx>
---
ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index 949187ea..f66c6a46 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -2898,8 +2898,6 @@ static int close_target(void)
if (close(out_fd) == -1)
return sys_errmsg("cannot close the target '%s'", output);
}
- if (output)
- free(output);
return 0;
}

@@ -3096,6 +3094,7 @@ int main(int argc, char *argv[])
printf("Success!\n");

out:
+ free(output);
close_ubi();
crypto_cleanup();
return err;
--
2.13.6