SabreTools/SabreTools.Hashing
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Hashing.git synced 2026-09-22 23:05:09 +00:00
Code Issues 1 Packages Projects Releases 15 Wiki Activity

All unsafe setting of length in hashing

Browse Source
This commit is contained in:
Matt Nadareski
2024-07-15 23:38:12 -04:00
parent 87fb62d772
commit 3fa3ece655
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SabreTools.Hashing/HashTool.cs
View File

@@ -338,7 +338,7 @@ namespace SabreTools.Hashing
/// <param name="input">Stream to hash</param>
/// <param name="hashTypes">Array of hash types to get from the file</param>
/// <returns>Dictionary containing hashes on success, null on error</returns>
public static Dictionary<HashType, string?>? GetStreamHashes(Stream input, HashType[] hashTypes, bool leaveOpen = false)
public static Dictionary<HashType, string?>? GetStreamHashes(Stream input, HashType[] hashTypes, long length = -1, bool leaveOpen = false)
{
// Create the output dictionary
var hashDict = new Dictionary<HashType, string?>();
@@ -369,7 +369,7 @@ namespace SabreTools.Hashing
*/
// Pre load the first buffer
long refsize = input.Length;
long refsize = length > -1 ? length : input.Length;
int next = refsize > buffersize ? buffersize : (int)refsize;
input.Read(buffer0, 0, next);
int current = next;
@@ -449,7 +449,7 @@ namespace SabreTools.Hashing
/// <param name="input">Stream to hash</param>
/// <param name="hashTypes">Array of hash types to get from the file</param>
/// <returns>Dictionary containing hashes on success, null on error</returns>
private static Dictionary<HashType, byte[]?>? GetStreamHashArrays(Stream input, HashType[] hashTypes, bool leaveOpen = false)
private static Dictionary<HashType, byte[]?>? GetStreamHashArrays(Stream input, HashType[] hashTypes, long length = -1, bool leaveOpen = false)
{
// Create the output dictionary
var hashDict = new Dictionary<HashType, byte[]?>();
@@ -480,7 +480,7 @@ namespace SabreTools.Hashing
*/
// Pre load the first buffer
long refsize = input.Length;
long refsize = length > -1 ? length : input.Length;
int next = refsize > buffersize ? buffersize : (int)refsize;
input.Read(buffer0, 0, next);
int current = next;