From d08ce9e5639792a844972297027e7f897e78c346 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 4 Mar 2021 08:43:17 -0500 Subject: [PATCH] Correct fd used in libarchive Actually use the cloned file descriptors --- confluent_server/confluent/osimage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index 510dd061..63bdd23d 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -228,7 +228,7 @@ def extract_file(archfile, flags=0, callback=lambda x: None, imginfo=(), extract dfd = os.dup(archfile.fileno()) os.lseek(dfd, 0, 0) try: - with libarchive.fd_reader(archfile.fileno()) as archive: + with libarchive.fd_reader(dfd) as archive: extract_entries(archive, flags, callback, totalsize, extractlist) finally: os.close(dfd) @@ -451,7 +451,7 @@ def scan_iso(archive): dfd = os.dup(archive.fileno()) os.lseek(dfd, 0, 0) try: - with libarchive.fd_reader(archive.fileno()) as reader: + with libarchive.fd_reader(dfd) as reader: for ent in reader: if str(ent).endswith('TRANS.TBL'): continue