components/libarchive/patches/archive_write_set_format_ar.c.patch
author John Beck <John.Beck@Oracle.COM>
Mon, 17 Jun 2013 14:23:50 -0700
branchs11-update
changeset 2651 9b563675339e
permissions -rw-r--r--
PSARC 2012/356 libarchive 15959922 add libarchive to Userland
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=287
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     3
Given the response "I just committed your patch.", it should
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     4
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_ar.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_ar.c	Tue Nov 27 17:48:04 2012
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     8
@@ -165,7 +165,7 @@
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
     9
 	 * Reject files with empty name.
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    10
 	 */
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    11
 	pathname = archive_entry_pathname(entry);
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    12
-	if (*pathname == '\0') {
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    13
+	if (pathname == NULL || *pathname == '\0') {
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    14
 		archive_set_error(&a->archive, EINVAL,
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    15
 		    "Invalid filename");
9b563675339e PSARC 2012/356 libarchive
John Beck <John.Beck@Oracle.COM>
parents:
diff changeset
    16
 		return (ARCHIVE_WARN);