xar: clean checksums on encoder setup failure

Finalize both file checksum contexts if encoder setup fails after init.

diff --git a/libarchive/archive_write_set_format_xar.c b/libarchive/archive_write_set_format_xar.c
index 59d94bf337f42b1eaf5caa087b56afd4e7457e45..e5b0d8ca57acfaa41c950472f431599302b5115e 100644 (file)
--- a/libarchive/archive_write_set_format_xar.c
+++ b/libarchive/archive_write_set_format_xar.c
@@ -674,9 +674,15 @@ xar_write_header(struct archive_write *a, struct archive_entry *entry)
        checksum_init(&(xar->e_sumwrk), xar->opt_sumalg);
        r = xar_compression_init_encoder(a);
 
-       if (r != ARCHIVE_OK)
+       if (r != ARCHIVE_OK) {
+               struct chksumval sumval;
+
+               checksum_final(&(xar->a_sumwrk), &sumval);
+               checksum_final(&(xar->e_sumwrk), &sumval);
+               xar->a_sumwrk.alg = CKSUM_NONE;
+               xar->e_sumwrk.alg = CKSUM_NONE;
                return (r);
-       else
+       } else
                return (r2);
 }