Gittes-archive/AssetRipper_AssetRipper
2
0
Fork 0
mirror of https://github.com/AssetRipper/AssetRipper.git synced 2025-12-11 20:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve #881

Browse Source
This commit is contained in:
Jeremy Pritts 2023-07-02 14:10:37 -04:00
parent a6ae0f1dfc
commit 086eb3f5ff
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/AssetRipper.IO.Files/BundleFiles/FileStream/BundleFileBlockReader.cs
View File

@ -92,7 +92,7 @@ namespace AssetRipper.IO.Files.BundleFiles.FileStream
}
else if (bytesWritten != uncompressedSize)
{
DecompressionFailedException.ThrowIncorrectNumberBytesWritten(uncompressedSize, bytesWritten);
DecompressionFailedException.ThrowIncorrectNumberBytesWritten(entry.PathFixed, uncompressedSize, bytesWritten);
}
new MemoryStream(uncompressedBytes).CopyTo(m_cachedBlockStream);
break;

9
Source/AssetRipper.IO.Files/BundleFiles/FileStream/FileStreamBundleFile.cs
View File

@ -1,4 +1,5 @@
using AssetRipper.IO.Endian;
using AssetRipper.IO.Files.Exceptions;
using AssetRipper.IO.Files.Extensions;
using AssetRipper.IO.Files.ResourceFiles;
using AssetRipper.IO.Files.Streams.Smart;
@ -79,9 +80,13 @@ namespace AssetRipper.IO.Files.BundleFiles.FileStream
byte[] uncompressedBytes = new byte[uncompressedSize];
byte[] compressedBytes = new BinaryReader(stream).ReadBytes(Header.CompressedBlocksInfoSize);
int bytesWritten = LZ4Codec.Decode(compressedBytes, uncompressedBytes);
if (bytesWritten != uncompressedSize)
if (bytesWritten < 0)
{
throw new Exception($"Incorrect number of bytes written. {bytesWritten} instead of {uncompressedSize} for {compressedBytes.Length} compressed bytes");
EncryptedFileException.Throw(NameFixed);
}
else if (bytesWritten != uncompressedSize)
{
DecompressionFailedException.ThrowIncorrectNumberBytesWritten(NameFixed, uncompressedSize, bytesWritten);
}
ReadMetadata(new MemoryStream(uncompressedBytes), uncompressedSize);
}

4
Source/AssetRipper.IO.Files/Exceptions/DecompressionFailedException.cs
View File

@ -11,8 +11,8 @@ public sealed class DecompressionFailedException : Exception
}
[DoesNotReturn]
internal static void ThrowIncorrectNumberBytesWritten(long expected, long actual)
internal static void ThrowIncorrectNumberBytesWritten(string fileName, long expected, long actual)
{
throw new DecompressionFailedException($"Incorrect number of bytes written. Expected {expected}, but was {actual}.");
throw new DecompressionFailedException($"Incorrect number of bytes written for '{fileName}' while decompressing. Expected {expected}, but was {actual}.");
}
}