Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions UnityPy/files/BundleFile.py
Original file line number Diff line number Diff line change
Expand Up @@ -502,14 +502,21 @@ def decompress_data(
The decompressed data."""
comp_flag = CompressionFlags(flags & ArchiveFlags.CompressionTypeMask)

if self.decryptor is not None and flags & 0x100:
compressed_data = self.decryptor.decrypt_block(compressed_data, index)
if self.decryptor is not None and comp_flag != CompressionFlags.NONE and flags & 0x100:
de_compressed_data = self.decryptor.decrypt_block(compressed_data, index)
else:
de_compressed_data = compressed_data

if comp_flag in CompressionHelper.DECOMPRESSION_MAP:
return cast(
bytes,
CompressionHelper.DECOMPRESSION_MAP[comp_flag](compressed_data, uncompressed_size),
)
try:
return cast(
bytes,
CompressionHelper.DECOMPRESSION_MAP[comp_flag](de_compressed_data, uncompressed_size),
)
except:
return cast(
bytes,
CompressionHelper.DECOMPRESSION_MAP[comp_flag](compressed_data, uncompressed_size),)
else:
raise ValueError(f"Unknown compression! flag: {flags}, compression flag: {comp_flag.value}")

Expand Down