Merge pull request #684 from onekey-sec/683-fix-sparse-tar

improve tar handler to support sparse archives.
onekey-sec · Dec 16, 2023 · ad76949 · ad76949
2 parents 41004be + 2b5a2fa
commit ad76949
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/tests/integration/archive/tar/__input__/sparse.tar b/tests/integration/archive/tar/__input__/sparse.tar
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy1 b/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy1
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy2 b/tests/integration/archive/tar/__output__/sparse.tar_extract/dummy2
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/file1 b/tests/integration/archive/tar/__output__/sparse.tar_extract/file1
diff --git a/tests/integration/archive/tar/__output__/sparse.tar_extract/file2 b/tests/integration/archive/tar/__output__/sparse.tar_extract/file2
diff --git a/unblob/handlers/archive/tar.py b/unblob/handlers/archive/tar.py
@@ -59,8 +59,7 @@ def _get_end_of_last_tar_entry(file) -> int:
     if last_member is None:
         return -1
 
-    last_file_size = round_up(last_member.size, BLOCK_SIZE)
-    end_of_last_tar_entry = last_member.offset_data + last_file_size
+    end_of_last_tar_entry = tf.offset
     try:
         file.seek(end_of_last_tar_entry)
     except SeekError: