components/libarchive/patches/archive_write_set_format_zip.c.patch
author John Beck <John.Beck@Oracle.COM>
Tue, 28 May 2013 11:52:39 -0700
changeset 1316 22b5cf35a3ea
permissions -rw-r--r--
PSARC 2012/356 libarchive 15959922 add libarchive to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1316
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch was fed back to the upstream community:
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
http://code.google.com/p/libarchive/issues/detail?id=286
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
Given the response "I applied your patch to zip writer."
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
it should no longer be needed with the next release.
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     6
--- libarchive/libarchive/archive_write_set_format_zip.c.orig	Mon Mar 26 19:49:00 2012
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     7
+++ libarchive/libarchive/archive_write_set_format_zip.c	Tue Nov 27 17:31:42 2012
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
@@ -842,6 +842,8 @@
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 	type = archive_entry_filetype(entry);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
 	path = archive_entry_pathname(entry);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
 
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
+	if (path == NULL)
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
+		return (0);
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
 	if ((type == AE_IFDIR) & (path[strlen(path) - 1] != '/')) {
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
 		return strlen(path) + 1;
22b5cf35a3ea PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
 	} else {