Skip to content

Dev/v3.17.9.3/ More information about invalid chunk data exception #185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
witcher112 merged 1 commit into from
Feb 22, 2022
Merged

Dev/v3.17.9.3/ More information about invalid chunk data exception #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions Assets/PatchKit Patcher/Scripts/AppData/Remote/Downloaders/ChunkedFileStream.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,14 +188,18 @@ public void Write([NotNull] byte[] buffer, int offset, int count)

if (ChunkFullyInBuffer())
{
if (BufferedChunkValid())
byte[] bufferHash = _hashFunction(_buffer, 0, (int) Math.Min(_chunksData.ChunkSize, RemainingLength));
byte[] chunkHash = _chunksData.Chunks[_chunkIndex + _startChunk].Hash;

if (BufferedChunkValid(bufferHash, chunkHash))
{
FlushBuffer();
}
else
{
DiscardBuffer();
throw new InvalidChunkDataException("Invalid chunk data.");
throw new InvalidChunkDataException("Invalid chunk data. Expected " +
BitConverter.ToString(chunkHash) + ", got " + BitConverter.ToString(bufferHash));
}
}
} while (count > 0);
Expand All @@ -206,11 +210,8 @@ private bool ChunkFullyInBuffer()
return _bufferPos == Math.Min(_chunksData.ChunkSize, RemainingLength);
}

private bool BufferedChunkValid()
private bool BufferedChunkValid(byte[] bufferHash, byte[] chunkHash)
{
byte[] bufferHash = _hashFunction(_buffer, 0, (int) Math.Min(_chunksData.ChunkSize, RemainingLength));
byte[] chunkHash = _chunksData.Chunks[_chunkIndex + _startChunk].Hash;

return bufferHash.SequenceEqual(chunkHash);
}

Expand Down
2 changes: 1 addition & 1 deletion Assets/PatchKit Patcher/Scripts/Version.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public static class Version
public const int Major = 3;
public const int Minor = 17;
public const int Patch = 9;
public const int Hotfix = 2;
public const int Hotfix = 3;

public static string Value
{
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [3.17.9.3]
### Added
- More information about invalid chunk data exception

## [3.17.9.2]
### Changed
- HDPI scale thresholds
Expand Down