@matheusbsbs / matheus-bagliano / commits / 0f3a461d4e

trailer: free trailer_info _after_ all related usage

In de7c27a186 (trailer: use offsets for trailer_start/trailer_end, 2023-10-20), we started using trailer block offsets in trailer_info. In particular, we dropped the use of a separate stack variable "size_t trailer_end", in favor of accessing the new "trailer_block_end" member of trailer_info (as "info.trailer_block_end"). At that time, we forgot to also move the trailer_info_release(&info); line to be _after_ this new use of the trailer_info struct. Move it now. Note that even without this patch, we didn't have leaks or any other problems because trailer_info_release() only frees memory allocated on the heap. The "trailer_block_end" member was allocated on the stack back then (as it is now) so it was still safe to use for all this time. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Linus Arver <linusa@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Linus Arver committed Mar 1, 2024 at 00:14 UTC 0f3a461d4e0f8854181054d86681c0664ae8c0cc

1 file changed +1 -2

trailer.c

+1 -2

@@ -1111,13 +1111,12 @@ void process_trailers(const char *file,

1111 }

1112

1113 print_all(outfile, &head, opts);

1114 -

1114 free_all(&head);

1116 - trailer_info_release(&info);

1115

1116 /* Print the lines after the trailers as is */

1117 if (!opts->only_trailers)

1118 fwrite(sb.buf + info.trailer_block_end, 1, sb.len - info.trailer_block_end, outfile);

1119 + trailer_info_release(&info);

1120

1121 if (opts->in_place)

1122 if (rename_tempfile(&trailers_tempfile, file))