 @@ -486,40 +486,40 @@ sunacl_get(int cmd, int *aclcnt, int fd,
 			break;
+		}
+	}
 	*aclcnt = cnt;
 	return (aclp);
+}
 #endif	/* HAVE_SUN_ACL */
 #if HAVE_POSIX_ACL || HAVE_NFS4_ACL
 static int translate_acl(struct archive_read_disk *a,
     struct archive_entry *entry,
 #if HAVE_SUN_ACL
-    void *acl,
+    void *aclp,
     int aclcnt,
 #else
     acl_t acl,
 #endif
     int archive_entry_acl_type);
 static int
 setup_acls(struct archive_read_disk *a,
     struct archive_entry *entry, int *fd)
+{
 	const char	*accpath;
 #if HAVE_SUN_ACL
-	void		*acl;
+	void		*aclp;
 	int		aclcnt;
 #else
 	acl_t		acl;
 #endif
 	int		r;
 	accpath = NULL;
 #if HAVE_SUN_ACL || HAVE_DARWIN_ACL || HAVE_ACL_GET_FD_NP
 	if (*fd < 0)
 #else
 	/* For default ACLs on Linux we need reachable accpath */
 	if (*fd < 0 || S_ISDIR(archive_entry_mode(entry)))
 @@ -537,173 +537,190 @@ setup_acls(struct archive_read_disk *a,
 		if (a->tree != NULL &&
 #if !HAVE_SUN_ACL && !HAVE_DARWIN_ACL && !HAVE_ACL_GET_FD_NP
 		    *fd < 0 &&
 #endif
 		    (a->follow_symlinks ||
 		    archive_entry_filetype(entry) != AE_IFLNK)) {
 			*fd = a->open_on_current_dir(a->tree,
 			    accpath, O_RDONLY | O_NONBLOCK);
+		}
+	}
 	archive_entry_acl_clear(entry);
 #if HAVE_SUN_ACL
 	aclp = NULL;
 #else
 	acl = NULL;
 #endif
 #if HAVE_NFS4_ACL
 	/* Try NFSv4 ACL first. */
 	if (*fd >= 0)
 #if HAVE_SUN_ACL
-		acl = sunacl_get(ACE_GETACL, &aclcnt, *fd, NULL);
+		aclp = sunacl_get(ACE_GETACL, &aclcnt, *fd, NULL);
 #elif HAVE_ACL_GET_FD_NP
 		acl = acl_get_fd_np(*fd, ARCHIVE_PLATFORM_ACL_TYPE_NFS4);
 #else
 		acl = acl_get_fd(*fd);
 #endif
 #if HAVE_ACL_GET_LINK_NP
 	else if (!a->follow_symlinks)
 		acl = acl_get_link_np(accpath, ARCHIVE_PLATFORM_ACL_TYPE_NFS4);
 #else
 	else if ((!a->follow_symlinks)
 	    && (archive_entry_filetype(entry) == AE_IFLNK))
 		/* We can't get the ACL of a symlink, so we assume it can't
 		   have one. */
 #if HAVE_SUN_ACL
 		aclp = NULL;
 #else
 		acl = NULL;
 #endif
 #endif /* !HAVE_ACL_GET_LINK_NP */
 	else
 #if HAVE_SUN_ACL
 		/* Solaris reads both POSIX.1e and NFSv4 ACLs here */
-		acl = sunacl_get(ACE_GETACL, &aclcnt, 0, accpath);
+		aclp = sunacl_get(ACE_GETACL, &aclcnt, 0, accpath);
 #else
 		acl = acl_get_file(accpath, ARCHIVE_PLATFORM_ACL_TYPE_NFS4);
 #endif
 #if HAVE_ACL_IS_TRIVIAL_NP || HAVE_SUN_ACL
 	/* Ignore "trivial" ACLs that just mirror the file mode. */
 	if (acl != NULL) {
 #if HAVE_SUN_ACL
-		if (sun_acl_is_trivial(acl, aclcnt, archive_entry_mode(entry),
+	if (aclp != NULL && sun_acl_is_trivial(aclp, aclcnt,
-, S_ISDIR(archive_entry_mode(entry)), &r) == 0 && r == 1)
+	    archive_entry_mode(entry), 1, S_ISDIR(archive_entry_mode(entry)),
 	    &r) == 0 && r == 1) {
 		free(aclp);
 		aclp = NULL;
 		return (ARCHIVE_OK);
+	}
 #elif HAVE_ACL_IS_TRIVIAL_NP
-		if (acl_is_trivial_np(acl, &r) == 0 && r == 1)
+	if (acl != NULL && acl_is_trivial_np(acl, &r) == 0 && r == 1) {
 		acl_free(acl);
 		acl = NULL;
 		return (ARCHIVE_OK);
+	}
 #endif
 #if HAVE_SUN_ACL
-			free(acl);
+	if (aclp != NULL)
 #else
-			acl_free(acl);
+	if (acl != NULL)
 #endif
 			acl = NULL;
-			/*
+		r = translate_acl(a, entry,
 			 * Simultaneous NFSv4 and POSIX.1e ACLs for the same
 			 * entry are not allowed, so we should return here
 			 */
 			return (ARCHIVE_OK);
 #endif	/* HAVE_ACL_IS_TRIVIAL_NP || HAVE_SUN_ACL */
 	if (acl != NULL) {
 		r = translate_acl(a, entry, acl,
 #if HAVE_SUN_ACL
-		    aclcnt,
+		    aclp, aclcnt,
 #else
 		    acl,
 #endif
 		    ARCHIVE_ENTRY_ACL_TYPE_NFS4);
 #if HAVE_SUN_ACL
-		free(acl);
+		free(aclp);
 		aclp = NULL;
 #else
 		acl_free(acl);
 		acl = NULL;
 #endif
 		if (r != ARCHIVE_OK) {
 			archive_set_error(&a->archive, errno,
 			    "Couldn't translate NFSv4 ACLs");
+		}
 #if HAVE_DARWIN_ACL
 		/*
 		 * Because Mac OS doesn't support owner@, group@ and everyone@
 		 * ACLs we need to add NFSv4 ACLs mirroring the file mode to
 		 * the archive entry. Otherwise extraction on non-Mac platforms
 		 * would lead to an invalid file mode.
 		 */
 		if ((archive_entry_acl_types(entry) &
 		    ARCHIVE_ENTRY_ACL_TYPE_NFS4) != 0)
 			add_trivial_nfs4_acl(entry);
 #endif
 		return (r);
+	}
 #endif	/* HAVE_NFS4_ACL */
 #if HAVE_POSIX_ACL || HAVE_SUN_ACL
 	/* This code path is skipped on MacOS */
 	/* Retrieve access ACL from file. */
 	if (*fd >= 0)
 #if HAVE_SUN_ACL
-		acl = sunacl_get(GETACL, &aclcnt, *fd, NULL);
+		aclp = sunacl_get(GETACL, &aclcnt, *fd, NULL);
 #else
 		acl = acl_get_fd(*fd);
 #endif
 #if HAVE_ACL_GET_LINK_NP
 	else if (!a->follow_symlinks)
 		acl = acl_get_link_np(accpath, ACL_TYPE_ACCESS);
 #else
 	else if ((!a->follow_symlinks)
 	    && (archive_entry_filetype(entry) == AE_IFLNK))
 		/* We can't get the ACL of a symlink, so we assume it can't
 		   have one. */
 #if HAVE_SUN_ACL
 		aclp = NULL;
 #else
 		acl = NULL;
 #endif
 #endif /* !HAVE_ACL_GET_LINK_NP */
 	else
 #if HAVE_SUN_ACL
-		acl = sunacl_get(GETACL, &aclcnt, 0, accpath);
+		aclp = sunacl_get(GETACL, &aclcnt, 0, accpath);
 #else
 		acl = acl_get_file(accpath, ACL_TYPE_ACCESS);
 #endif
 #if HAVE_ACL_IS_TRIVIAL_NP || HAVE_SUN_ACL
 	/* Ignore "trivial" ACLs that just mirror the file mode. */
 	if (acl != NULL) {
 #if HAVE_SUN_ACL
-		if (sun_acl_is_trivial(acl, aclcnt, archive_entry_mode(entry),
+	if (aclp != NULL && sun_acl_is_trivial(aclp, aclcnt,
-, S_ISDIR(archive_entry_mode(entry)), &r) == 0 && r == 1)
+	    archive_entry_mode(entry), 0, S_ISDIR(archive_entry_mode(entry)),
-#else
+	    &r) == 0 && r == 1) {
-		if (acl_is_trivial_np(acl, &r) == 0)
+		free(aclp);
 		aclp = NULL;
+	}
 #elif HAVE_ACL_IS_TRIVIAL_NP
 	if (acl != NULL && acl_is_trivial_np(acl, &r) == 0 && r == 1) {
 		acl_free(acl);
 		acl = NULL;
+	}
 #endif
 			if (r) {
 #if HAVE_SUN_ACL
-				free(acl);
+	if (aclp != NULL)
 #else
-				acl_free(acl);
+	if (acl != NULL)
 #endif
 				acl = NULL;
 		r = translate_acl(a, entry,
 #endif
 	if (acl != NULL) {
 		r = translate_acl(a, entry, acl,
 #if HAVE_SUN_ACL
-		    aclcnt,
+		    aclp, aclcnt,
 #else
 		    acl,
 #endif
 		    ARCHIVE_ENTRY_ACL_TYPE_ACCESS);
 #if HAVE_SUN_ACL
-		free(acl);
+		free(aclp);
 		aclp = NULL;
 #else
 		acl_free(acl);
 #endif
 		acl = NULL;
 #endif
 		if (r != ARCHIVE_OK) {
 			archive_set_error(&a->archive, errno,
 			    "Couldn't translate access ACLs");
 			return (r);
+		}
+	}
 #if !HAVE_SUN_ACL
 	/* Only directories can have default ACLs. */
 	if (S_ISDIR(archive_entry_mode(entry))) {
 #if HAVE_ACL_GET_FD_NP
 		if (*fd >= 0)
 			acl = acl_get_fd_np(*fd, ACL_TYPE_DEFAULT);