Merge pull request #8375 from mono/jstedfast-breakpoint-resolver-nre-8.2

[8.2][Debugger] Protect against null document text buffers

1 files changed, 10 insertions, 2 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
index 9e19487fc4..0a0b42e644 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/DebuggingService.cs
@@ -1495,13 +1495,21 @@ namespace MonoDevelop.Debugger
 		{
 			var doc = IdeApp.Workbench.GetDocument (document.FilePath);
 			IBreakpointSpanResolver resolver = null;
+			ITextBuffer buffer;
 
-			if (doc != null)
+			if (doc != null) {
 				resolver = doc.GetContent<IBreakpointSpanResolver> ();
+				buffer = doc.TextBuffer;
+			} else {
+				buffer = document.TextBuffer;
+			}
+
+			if (buffer == null)
+				return Task.FromResult (default (Span));
 
 			resolver = resolver ?? new DefaultBreakpointSpanResolver ();
 
-			return resolver.GetBreakpointSpanAsync (document.TextBuffer, position, cancellationToken);
+			return resolver.GetBreakpointSpanAsync (buffer, position, cancellationToken);
 		}
 	}