Merge pull request #43352 from sharwell/failfast-nre

Fix NullReferenceException in FailFast handling
dotnet · Apr 15, 2020 · 72b31ae · 72b31ae
2 parents f3f6268 + c90aa78
commit 72b31ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/Compilers/Core/Portable/InternalUtilities/FailFast.cs b/src/Compilers/Core/Portable/InternalUtilities/FailFast.cs
@@ -65,11 +65,10 @@ internal static void DumpStackTrace(Exception? exception = null, string? message
             if (exception is object)
             {
                 Console.WriteLine("Exception info");
-                for (Exception? current = exception; current is object; current = current!.InnerException)
+                for (Exception? current = exception; current is object; current = current.InnerException)
                 {
                     Console.WriteLine(current.Message);
                     Console.WriteLine(current.StackTrace);
-                    current = current.InnerException;
                 }
             }
 

diff --git a/src/Workspaces/Core/Portable/Storage/SQLite/v1/Interop/SqlConnection.cs b/src/Workspaces/Core/Portable/Storage/SQLite/v1/Interop/SqlConnection.cs
@@ -100,7 +100,7 @@ private SqlConnection(sqlite3 handle, IPersistentStorageFaultInjector faultInjec
             {
                 var ex = new InvalidOperationException("SqlConnection was not properly closed");
                 _faultInjector?.OnFatalError(ex);
-                FatalError.Report(new InvalidOperationException("SqlConnection was not properly closed"));
+                FatalError.Report(ex);
             }
         }