Fix memory leaks in pax writer when handing mac metadata.

diff --git a/libarchive/archive_write_set_format_pax.c b/libarchive/archive_write_set_format_pax.c
index 754e5f96fe2e548fbe8ac63e7eab2ee70ed457e5..687f8e48a9b790c9b9944fb698440c2974a927cb 100644 (file)
--- a/libarchive/archive_write_set_format_pax.c
+++ b/libarchive/archive_write_set_format_pax.c
@@ -647,8 +647,10 @@ archive_write_pax_header(struct archive_write *a,
                oname = archive_entry_pathname(entry_original);
                name_length = strlen(oname);
                name = malloc(name_length + 3);
-               if (name == NULL) {
+               if (name == NULL || extra == NULL) {
                        /* XXX error message */
+                       archive_entry_free(extra);
+                       free(name);
                        return (ARCHIVE_FAILED);
                }
                strcpy(name, oname);
@@ -687,6 +689,7 @@ archive_write_pax_header(struct archive_write *a,
 
                /* Recurse to write the special copyfile entry. */
                r = archive_write_pax_header(a, extra);
+               archive_entry_free(extra);
                if (r < ARCHIVE_WARN)
                        return (r);
                if (r < ret)