From 1f25dc4bac08208b7a71d525cf577cbc1344b8ca Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 28 Jul 2020 16:17:54 -0700
Subject: [PATCH] Fix single-line SMDB corner case

---
 SabreTools.Library/Tools/FileExtensions.cs | 33 ++++++++++++++++------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/SabreTools.Library/Tools/FileExtensions.cs b/SabreTools.Library/Tools/FileExtensions.cs
index e3803042..9ee12cf9 100644
--- a/SabreTools.Library/Tools/FileExtensions.cs
+++ b/SabreTools.Library/Tools/FileExtensions.cs
@@ -100,17 +100,32 @@ namespace SabreTools.Library.Tools
             // For everything else, we need to read it
             try
             {
-                // Get the first two non-whitespace, non-comment lines to check
-                StreamReader sr = File.OpenText(filename);
-                string first = sr.ReadLine().ToLowerInvariant();
-                while (string.IsNullOrWhiteSpace(first) || first.StartsWith("<!--"))
-                    first = sr.ReadLine().ToLowerInvariant();
+                // Get the first two non-whitespace, non-comment lines to check, if possible
+                string first = string.Empty, second = string.Empty;
 
-                string second = sr.ReadLine().ToLowerInvariant();
-                while (string.IsNullOrWhiteSpace(second) || second.StartsWith("<!--"))
-                    second = sr.ReadLine().ToLowerInvariant();
+                try
+                {
+                    using (StreamReader sr = File.OpenText(filename))
+                    {
+                        first = sr.ReadLine().ToLowerInvariant();
+                        while ((string.IsNullOrWhiteSpace(first) || first.StartsWith("<!--"))
+                            && !sr.EndOfStream)
+                        {
+                            first = sr.ReadLine().ToLowerInvariant();
+                        }
 
-                sr.Dispose();
+                        if (!sr.EndOfStream)
+                        {
+                            second = sr.ReadLine().ToLowerInvariant();
+                            while (string.IsNullOrWhiteSpace(second) || second.StartsWith("<!--")
+                                && !sr.EndOfStream)
+                            {
+                                second = sr.ReadLine().ToLowerInvariant();
+                            }
+                        }
+                    }
+                }
+                catch { }
 
                 // If we have an XML-based DAT
                 if (first.Contains("<?xml") && first.Contains("?>"))