Skip to content

Fix crash when overwriting manually installed files #3349

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
DasSkelett merged 2 commits into from
Apr 15, 2021
Merged

Fix crash when overwriting manually installed files #3349

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a7f93e
Fix crash when overwriting manually installed files
HebaruSan Apr 15, 2021
e3d5486
Remove unreachable code
HebaruSan Apr 15, 2021
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
10 changes: 7 additions & 3 deletions Core/ModuleInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,10 +458,16 @@ private bool StreamsEqual(Stream s1, Stream s2)
const int bufLen = 1024;
byte[] bytes1 = new byte[bufLen];
byte[] bytes2 = new byte[bufLen];
for (int bytesChecked = 0; bytesChecked < s1.Length; )
int bytesChecked = 0;
while (true)
{
int bytesFrom1 = s1.Read(bytes1, 0, bufLen);
int bytesFrom2 = s2.Read(bytes2, 0, bufLen);
if (bytesFrom1 == 0 && bytesFrom2 == 0)
{
// Boths streams finished, all bytes are equal
return true;
}
if (bytesFrom1 != bytesFrom2)
{
// One ended early, not equal.
Expand All @@ -479,8 +485,6 @@ private bool StreamsEqual(Stream s1, Stream s2)
}
bytesChecked += bytesFrom1;
}
// Same bytes, they're equal.
return true;
}

/// <summary>
Expand Down