aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTim Kientzle <kientzle@FreeBSD.org>2006-08-01 05:31:29 +0000
committerTim Kientzle <kientzle@FreeBSD.org>2006-08-01 05:31:29 +0000
commit225ade520e338273930fa1962beff560436e423f (patch)
tree7175f64b7c985347bcb4e142e6dbfaf316dc0437 /lib
parenta4755e0e1385fd910d91c56a147121de6264b833 (diff)
Notes
Diffstat (limited to 'lib')
-rw-r--r--lib/libarchive/archive_write.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libarchive/archive_write.c b/lib/libarchive/archive_write.c
index 73283e456c5c..3a999ca34fa2 100644
--- a/lib/libarchive/archive_write.c
+++ b/lib/libarchive/archive_write.c
@@ -201,7 +201,9 @@ archive_write_header(struct archive *a, struct archive_entry *entry)
if (a->state & ARCHIVE_STATE_DATA)
((a->format_finish_entry)(a));
- if (archive_entry_dev(entry) == a->skip_file_dev &&
+ if (a->skip_file_dev != 0 &&
+ archive_entry_dev(entry) == a->skip_file_dev &&
+ a->skip_file_ino != 0 &&
archive_entry_ino(entry) == a->skip_file_ino) {
archive_set_error(a, 0, "Can't add archive to itself");
return (ARCHIVE_WARN);