components/libarchive/patches/archive_write_set_format_zip.c.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 24 Mar 2014 15:08:36 -0700
branchs11-update
changeset 3005 78cdd8ccc600
parent 2651 9b563675339e
permissions -rw-r--r--
Close of build 36.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2651
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     1
This patch was fed back to the upstream community:
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     2
http://code.google.com/p/libarchive/issues/detail?id=286
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
Given the response "I applied your patch to zip writer."
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
it should no longer be needed with the next release.
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     5
9b563675339e 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
9b563675339e 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
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
@@ -842,6 +842,8 @@
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 	type = archive_entry_filetype(entry);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
 	path = archive_entry_pathname(entry);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
 
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
+	if (path == NULL)
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
+		return (0);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
 	if ((type == AE_IFDIR) & (path[strlen(path) - 1] != '/')) {
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
 		return strlen(path) + 1;
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
 	} else {