From 348a2a2bcbf7cdd18f8246d33de4bf68716cbe04 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 7 Oct 2020 13:19:33 -0700 Subject: [PATCH] Fix possible issue with BOM detection --- SabreTools.Library/IO/FileExtensions.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SabreTools.Library/IO/FileExtensions.cs b/SabreTools.Library/IO/FileExtensions.cs index 39cf9043..429ee9fe 100644 --- a/SabreTools.Library/IO/FileExtensions.cs +++ b/SabreTools.Library/IO/FileExtensions.cs @@ -203,9 +203,13 @@ namespace SabreTools.Library.IO /// http://stackoverflow.com/questions/3825390/effective-way-to-find-any-files-encoding public static Encoding GetEncoding(string filename) { + // Try to open the file + FileStream file = TryOpenRead(filename); + if (file == null) + return Encoding.Default; + // Read the BOM var bom = new byte[4]; - FileStream file = FileExtensions.TryOpenRead(filename); file.Read(bom, 0, 4); file.Dispose();