A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
#403 - Checksum Generator is wrong about gz file hash (#405)
Michael847badb69940
diff --git a/src/dev/impl/DevToys/Helpers/HashingHelper.cs b/src/dev/impl/DevToys/Helpers/HashingHelper.csindex 0e14d9d0e..09011a80a 100644--- a/src/dev/impl/DevToys/Helpers/HashingHelper.cs+++ b/src/dev/impl/DevToys/Helpers/HashingHelper.cs@@ -22,33 +22,31 @@ namespace DevToys.HelpersArguments.NotNull(stream, nameof(stream));Arguments.NotNull(hashAlgorithm, nameof(hashAlgorithm));- byte[] readAheadBuffer = new byte[bufferSize];byte[] buffer = new byte[bufferSize];- int readAheadBytes = await stream.ReadAsync(readAheadBuffer, 0, bufferSize, cancellationToken);- int bytesRead;- long totalBytesRead = readAheadBytes;-- while (readAheadBytes != 0)+ if (stream.Length == 0){- bytesRead = readAheadBytes;- Buffer.BlockCopy(readAheadBuffer, 0, buffer, 0, bytesRead);+ return Array.Empty<byte>();+ }- readAheadBytes = await stream.ReadAsync(readAheadBuffer, 0, bufferSize, cancellationToken);- totalBytesRead += readAheadBytes;+ int bytesRead = 0;+ long totalBytesRead = 0;- if (readAheadBytes == 0)- {- hashAlgorithm.TransformFinalBlock(buffer, 0, bytesRead);- }- else- {- hashAlgorithm.TransformBlock(buffer, 0, bytesRead, buffer, 0);- }+ while ((bytesRead = await stream.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) != 0)+ {+ hashAlgorithm.TransformBlock(buffer, 0, bytesRead, buffer, 0);+ totalBytesRead += bytesRead;+ ProgessAndCancellation();+ }+ hashAlgorithm.TransformFinalBlock(buffer, 0, bytesRead);+ ProgessAndCancellation();+ void ProgessAndCancellation()+ {progress.Report(new HashingProgress(stream.Length, totalBytesRead));cancellationToken.ThrowIfCancellationRequested();}+return hashAlgorithm.Hash ?? Array.Empty<byte>();}