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>

diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
index 453a5c76cdfbaf7a57a85691691f8be0ea811ccd..f4cb51252e72e933f1dbe81e2a67ce086a61d1c8 100644 (file)
--- 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;