summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhihao Cheng <chengzhihao1@huawei.com>2024-02-22 20:37:40 +0800
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2024-09-25 09:08:41 +0200
commit6ff8739a6bf5fce30e9d99ee4b35322313300dcb (patch)
treeb9e702563fa850510a58e594f044127634ef4044
parent8999ef158d26d9e7fe01c3d4989340342f9c69aa (diff)
mkfs.ubifs: Fix memleak for 'output' in error paths
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@huawei.com> Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--ubifs-utils/mkfs.ubifs/mkfs.ubifs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index 453a5c7..f4cb512 100644
--- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
@@ -2886,8 +2886,6 @@ static int close_target(void)
if (close(out_fd) == -1)
return sys_err_msg("cannot close the target '%s'", output);
}
- if (output)
- free(output);
return 0;
}
@@ -3081,6 +3079,7 @@ int main(int argc, char *argv[])
printf("Success!\n");
out:
+ free(output);
close_ubi();
crypto_cleanup();
return err;