Merge pull request #73790 from jasonmalinowski/fix-nullref-during-shu…

…tdown Copy the ITelemetryReporter to a local before using
dotnet · May 31, 2024 · e0abd64 · e0abd64
2 parents c11fc36 + fde8c37
commit e0abd64
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Logging/RoslynLogger.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Logging/RoslynLogger.cs
@@ -74,12 +74,14 @@ private static void ReportFault(Exception exception, ErrorSeverity severity, boo
                     return;
                 }
 
-                if (_telemetryReporter is not null)
+                // Copy locally, as otherwise if we report a fault during shutdown we might also null reference (and then fatally crash the process)
+                var telemetryReporter = _telemetryReporter;
+                if (telemetryReporter is not null)
                 {
                     var eventName = GetEventName(FunctionId.NonFatalWatson);
                     var description = GetDescription(exception);
                     var currentProcess = Process.GetCurrentProcess();
-                    _telemetryReporter.ReportFault(eventName, description, (int)severity, forceDump, currentProcess.Id, exception);
+                    telemetryReporter.ReportFault(eventName, description, (int)severity, forceDump, currentProcess.Id, exception);
                 }
             }
             catch (OutOfMemoryException)