From 9a85a82af80a0842d9b4d8b178bc27d069f067cb Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Thu, 29 Jun 2017 22:10:15 +0100 Subject: [PATCH] Close opened files. --- Adler32Context.cs | 2 ++ CRC16Context.cs | 2 ++ CRC32Context.cs | 2 ++ CRC64Context.cs | 2 ++ MD5Context.cs | 6 +++++- RIPEMD160Context.cs | 6 +++++- SHA1Context.cs | 6 +++++- SHA256Context.cs | 6 +++++- SHA384Context.cs | 6 +++++- SHA512Context.cs | 6 +++++- 10 files changed, 38 insertions(+), 6 deletions(-) diff --git a/Adler32Context.cs b/Adler32Context.cs index 1b1103cb6..e03f7635b 100644 --- a/Adler32Context.cs +++ b/Adler32Context.cs @@ -137,6 +137,8 @@ namespace DiscImageChef.Checksums adlerOutput.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return adlerOutput.ToString(); } diff --git a/CRC16Context.cs b/CRC16Context.cs index 1ab16d137..adbfe4988 100644 --- a/CRC16Context.cs +++ b/CRC16Context.cs @@ -163,6 +163,8 @@ namespace DiscImageChef.Checksums crc16Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return crc16Output.ToString(); } diff --git a/CRC32Context.cs b/CRC32Context.cs index b560b942c..69d0dc16f 100644 --- a/CRC32Context.cs +++ b/CRC32Context.cs @@ -163,6 +163,8 @@ namespace DiscImageChef.Checksums crc32Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return crc32Output.ToString(); } diff --git a/CRC64Context.cs b/CRC64Context.cs index 10b616abc..7e7d8e172 100644 --- a/CRC64Context.cs +++ b/CRC64Context.cs @@ -163,6 +163,8 @@ namespace DiscImageChef.Checksums crc64Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return crc64Output.ToString(); } diff --git a/MD5Context.cs b/MD5Context.cs index 9f6614c59..b1e50f800 100644 --- a/MD5Context.cs +++ b/MD5Context.cs @@ -102,7 +102,9 @@ namespace DiscImageChef.Checksums public byte[] File(string filename) { FileStream fileStream = new FileStream(filename, FileMode.Open); - return _md5Provider.ComputeHash(fileStream); + byte[] result = _md5Provider.ComputeHash(fileStream); + fileStream.Close(); + return result; } /// @@ -121,6 +123,8 @@ namespace DiscImageChef.Checksums md5Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return md5Output.ToString(); } diff --git a/RIPEMD160Context.cs b/RIPEMD160Context.cs index f18f31e5e..5fb43a2fc 100644 --- a/RIPEMD160Context.cs +++ b/RIPEMD160Context.cs @@ -102,7 +102,9 @@ namespace DiscImageChef.Checksums public byte[] File(string filename) { FileStream fileStream = new FileStream(filename, FileMode.Open); - return _ripemd160Provider.ComputeHash(fileStream); + byte[] result = _ripemd160Provider.ComputeHash(fileStream); + fileStream.Close(); + return result; } /// @@ -121,6 +123,8 @@ namespace DiscImageChef.Checksums ripemd160Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return ripemd160Output.ToString(); } diff --git a/SHA1Context.cs b/SHA1Context.cs index 658ee5f1e..b79e7ee15 100644 --- a/SHA1Context.cs +++ b/SHA1Context.cs @@ -102,7 +102,9 @@ namespace DiscImageChef.Checksums public byte[] File(string filename) { FileStream fileStream = new FileStream(filename, FileMode.Open); - return _sha1Provider.ComputeHash(fileStream); + byte[] result = _sha1Provider.ComputeHash(fileStream); + fileStream.Close(); + return result; } /// @@ -121,6 +123,8 @@ namespace DiscImageChef.Checksums sha1Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return sha1Output.ToString(); } diff --git a/SHA256Context.cs b/SHA256Context.cs index ba6550980..cb8c40685 100644 --- a/SHA256Context.cs +++ b/SHA256Context.cs @@ -102,7 +102,9 @@ namespace DiscImageChef.Checksums public byte[] File(string filename) { FileStream fileStream = new FileStream(filename, FileMode.Open); - return _sha256Provider.ComputeHash(fileStream); + byte[] result = _sha256Provider.ComputeHash(fileStream); + fileStream.Close(); + return result; } /// @@ -121,6 +123,8 @@ namespace DiscImageChef.Checksums sha256Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return sha256Output.ToString(); } diff --git a/SHA384Context.cs b/SHA384Context.cs index 50d31c858..95852ef67 100644 --- a/SHA384Context.cs +++ b/SHA384Context.cs @@ -102,7 +102,9 @@ namespace DiscImageChef.Checksums public byte[] File(string filename) { FileStream fileStream = new FileStream(filename, FileMode.Open); - return _sha384Provider.ComputeHash(fileStream); + byte[] result = _sha384Provider.ComputeHash(fileStream); + fileStream.Close(); + return result; } /// @@ -121,6 +123,8 @@ namespace DiscImageChef.Checksums sha384Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return sha384Output.ToString(); } diff --git a/SHA512Context.cs b/SHA512Context.cs index fe7cd080c..fc50fc5de 100644 --- a/SHA512Context.cs +++ b/SHA512Context.cs @@ -102,7 +102,9 @@ namespace DiscImageChef.Checksums public byte[] File(string filename) { FileStream fileStream = new FileStream(filename, FileMode.Open); - return _sha512Provider.ComputeHash(fileStream); + byte[] result = _sha512Provider.ComputeHash(fileStream); + fileStream.Close(); + return result; } /// @@ -121,6 +123,8 @@ namespace DiscImageChef.Checksums sha512Output.Append(hash[i].ToString("x2")); } + fileStream.Close(); + return sha512Output.ToString(); }