From: Martin Matuska <martin@matuska.org>
Date: Sun, 3 Mar 2019 23:10:37 +0000 (+0100)
Subject: archive_read_disk_entry_from_file(): check for ARCHIVE_READ_DISK magic
X-Git-Tag: v3.4.0~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e10da80b22aee667b1e7768b7e4db7689d326cf2;p=thirdparty%2Flibarchive.git

archive_read_disk_entry_from_file(): check for ARCHIVE_READ_DISK magic

Fixes #1143
---

diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
index 1786cff38..7b6102e5e 100644
--- a/libarchive/archive_read_disk_entry_from_file.c
+++ b/libarchive/archive_read_disk_entry_from_file.c
@@ -163,6 +163,9 @@ archive_read_disk_entry_from_file(struct archive *_a,
 	int initial_fd = fd;
 	int r, r1;
 
+	archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, ARCHIVE_STATE_ANY,
+		"archive_read_disk_entry_from_file");
+
 	archive_clear_error(_a);
 	path = archive_entry_sourcepath(entry);
 	if (path == NULL)