lib: pedantically check archive_entry_pathname return values

Fixes: #688

Author: Duncaen

lib/archive.c

@@ -65,11 +65,13 @@ xbps_archive_get_file(struct archive *ar, struct archive_entry *entry)
 	for (;;) {
 		ssize_t rd = archive_read_data(ar, buf + used, len - used);
 		if (rd == ARCHIVE_FATAL || rd == ARCHIVE_WARN) {
+			const char *pname = archive_entry_pathname(entry);
+			if (!pname)
+				xbps_unreachable();
 			r = -xbps_archive_errno(ar);
 			xbps_error_printf(
 			    "failed to read archive entry: %s: %s\n",
-			    archive_entry_pathname(entry),
-			    archive_error_string(ar));
+			    pname, archive_error_string(ar));
 			goto err;
 		} else if (rd == ARCHIVE_RETRY) {
 			continue;
@@ -79,11 +81,13 @@ xbps_archive_get_file(struct archive *ar, struct archive_entry *entry)
 			break;
 	}
 	if (used < len) {
+		const char *pname = archive_entry_pathname(entry);
+		if (!pname)
+			xbps_unreachable();
 		r = -EIO;
 		xbps_error_printf(
 		    "failed to read archive entry: %s: could not read enough "
-		    "data: %s\n",
-		    archive_entry_pathname(entry), strerror(-r));
+		    "data: %s\n", pname, strerror(-r));
 		goto err;
 	}
 

lib/package_unpack.c

@@ -163,6 +163,8 @@ unpack_archive(struct xbps_handle *xhp,
 			break;
 
 		entry_pname = archive_entry_pathname(entry);
+		if (!entry_pname)
+			xbps_unreachable();
 
 		if (strcmp("./INSTALL", entry_pname) == 0 ||
 		    strcmp("./REMOVE", entry_pname) == 0 ||
@@ -215,6 +217,8 @@ unpack_archive(struct xbps_handle *xhp,
 			continue;
 
 		entry_pname = archive_entry_pathname(entry);
+		if (!entry_pname)
+			xbps_unreachable();
 		entry_size = archive_entry_size(entry);
 		entry_type = archive_entry_filetype(entry);
 		entry_statp = archive_entry_stat(entry);
@@ -407,6 +411,8 @@ unpack_archive(struct xbps_handle *xhp,
 		 * has been changed it will become a dangling pointer.
 		 */
 		entry_pname = archive_entry_pathname(entry);
+		if (!entry_pname)
+			xbps_unreachable();
 		/*
 		 * Extract entry from archive.
 		 */

lib/plist_fetch.c

@@ -89,6 +89,8 @@ xbps_archive_fetch_file(const char *url, const char *fname)
 		const char *bfile;
 
 		bfile = archive_entry_pathname(entry);
+		if (!bfile)
+			xbps_unreachable();
 		if (bfile[0] == '.')
 			bfile++; /* skip first dot */
 
@@ -139,6 +141,8 @@ xbps_archive_fetch_file_into_fd(const char *url, const char *fname, int fd)
 			break;
 		}
 		bfile = archive_entry_pathname(entry);
+		if (!bfile)
+			xbps_unreachable();
 		if (bfile[0] == '.')
 			bfile++; /* skip first dot */
 

lib/repo.c

@@ -121,6 +121,7 @@ static int
 repo_read_index(struct xbps_repo *repo, struct archive *ar)
 {
 	struct archive_entry *entry;
+	const char *pname;
 	char *buf;
 	int r;
 
@@ -129,7 +130,10 @@ repo_read_index(struct xbps_repo *repo, struct archive *ar)
 		return r;
 
 	/* index.plist */
-	if (strcmp(archive_entry_pathname(entry), XBPS_REPODATA_INDEX) != 0) {
+	pname = archive_entry_pathname(entry);
+	if (!pname)
+		xbps_unreachable();
+	if (strcmp(pname, XBPS_REPODATA_INDEX) != 0) {
 		xbps_error_printf("failed to read repository index: %s: unexpected archive entry\n",
 		    repo->uri);
 		r = -EINVAL;
@@ -175,14 +179,18 @@ static int
 repo_read_meta(struct xbps_repo *repo, struct archive *ar)
 {
 	struct archive_entry *entry;
+	const char *pname;
 	char *buf;
 	int r;
 
 	r = repo_read_next(repo, ar, &entry);
 	if (r < 0)
 		return r;
 
-	if (strcmp(archive_entry_pathname(entry), XBPS_REPODATA_META) != 0) {
+	pname = archive_entry_pathname(entry);
+	if (!pname)
+		xbps_unreachable();
+	if (strcmp(pname, XBPS_REPODATA_META) != 0) {
 		xbps_error_printf("failed to read repository metadata: %s: unexpected archive entry\n",
 		    repo->uri);
 		r = -EINVAL;
@@ -237,6 +245,7 @@ static int
 repo_read_stage(struct xbps_repo *repo, struct archive *ar)
 {
 	struct archive_entry *entry;
+	const char *pname;
 	int r;
 
 	r = repo_read_next(repo, ar, &entry);
@@ -249,7 +258,10 @@ repo_read_stage(struct xbps_repo *repo, struct archive *ar)
 		return r;
 	}
 
-	if (strcmp(archive_entry_pathname(entry), XBPS_REPODATA_STAGE) != 0) {
+	pname = archive_entry_pathname(entry);
+	if (!pname)
+		xbps_unreachable();
+	if (strcmp(pname, XBPS_REPODATA_STAGE) != 0) {
 		xbps_error_printf("failed to read repository stage: %s: unexpected archive entry\n",
 		    repo->uri);
 		r = -EINVAL;

lib/transaction_files.c

@@ -736,6 +736,8 @@ collect_binpkg_files(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod,
 			continue;
 
 		entry_pname = archive_entry_pathname(entry);
+		if (!entry_pname)
+			xbps_unreachable();
 		if ((strcmp("./files.plist", entry_pname)) == 0) {
 			filesd = xbps_archive_get_dictionary(ar, entry);
 			if (filesd == NULL) {

lib/transaction_internalize.c

@@ -140,6 +140,8 @@ internalize_binpkg(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod)
 			continue;
 
 		entry_pname = archive_entry_pathname(entry);
+		if (!entry_pname)
+			xbps_unreachable();
 
 		if (strcmp("./INSTALL", entry_pname) == 0) {
 			rv = internalize_script(pkg_repod, "install-script", ar, entry);