From 302f7f804d7683cbfff9a87aa7943654fabc2659 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Fri, 4 Oct 2024 17:35:12 +0900 Subject: [PATCH] Fix reordering of cleanup fns in archiver.c --- src/archiver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/archiver.c b/src/archiver.c index 646ad15..21976d9 100644 --- a/src/archiver.c +++ b/src/archiver.c @@ -2062,6 +2062,11 @@ int simple_archiver_write_v1(FILE *out_f, SDArchiverState *state, if (state->parsed->compressor && state->parsed->decompressor) { // Is compressing. + size_t temp_filename_size = strlen(state->parsed->temp_dir) + 1 + 64; + __attribute__((cleanup( + simple_archiver_helper_cleanup_c_string))) char *temp_filename = + malloc(temp_filename_size); + __attribute__((cleanup(cleanup_temp_filename_delete))) void **ptrs_array = malloc(sizeof(void *) * 2); ptrs_array[0] = NULL; @@ -2070,11 +2075,6 @@ int simple_archiver_write_v1(FILE *out_f, SDArchiverState *state, __attribute__((cleanup(simple_archiver_helper_cleanup_FILE))) FILE *temp_fd = NULL; - size_t temp_filename_size = strlen(state->parsed->temp_dir) + 1 + 64; - __attribute__((cleanup( - simple_archiver_helper_cleanup_c_string))) char *temp_filename = - malloc(temp_filename_size); - if (state->parsed->temp_dir) { size_t idx = 0; size_t temp_dir_len = strlen(state->parsed->temp_dir);