claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FileTools] Manual dispose of file stream (thanks edc!)

Browse Source
This commit is contained in:
Matt Nadareski
2016-09-22 14:45:28 -07:00
parent 5074f820c9
commit 062d43b3c2
1 changed files with 45 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
SabreTools.Helper/Tools/FileTools.cs
View File

@@ -492,10 +492,11 @@ namespace SabreTools.Helper
return encounteredErrors; return encounteredErrors;
} }
FileStream fs = null;
try try
{ {
using (FileStream fs = File.OpenRead(input)) fs = File.OpenRead(input);
{
if (at == ArchiveType.SevenZip && sevenzip != ArchiveScanLevel.External) if (at == ArchiveType.SevenZip && sevenzip != ArchiveScanLevel.External)
{ {
using (SevenZipArchive sza = SevenZipArchive.Open(fs)) using (SevenZipArchive sza = SevenZipArchive.Open(fs))
@@ -553,7 +554,6 @@ namespace SabreTools.Helper
} }
} }
} }
}
catch (EndOfStreamException) catch (EndOfStreamException)
{ {
// Catch this but don't count it as an error because SharpCompress is unsafe // Catch this but don't count it as an error because SharpCompress is unsafe
@@ -567,6 +567,11 @@ namespace SabreTools.Helper
// Don't log file open errors // Don't log file open errors
encounteredErrors = true; encounteredErrors = true;
} }
finally
{
fs.Close();
fs.Dispose();
}
return encounteredErrors; return encounteredErrors;
} }