prevent VS from crashing and other changes

microsoft · Oct 25, 2023 · 206f6aa · 206f6aa
1 parent 2a38c61
commit 206f6aa
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/Sarif.Viewer.VisualStudio.Core/ResultTextMarker.cs b/src/Sarif.Viewer.VisualStudio.Core/ResultTextMarker.cs
@@ -431,7 +431,15 @@ internal bool TryToFullyPopulateRegionAndFilePath()
                         out resolvedUri)))
                 {
                     // Fill out the region's properties
-                    this.fullyPopulatedRegion = FileRegionsCache.Instance.PopulateTextRegionProperties(this.region, resolvedUri, populateSnippet: true);
+                    try
+                    {
+                        this.fullyPopulatedRegion = FileRegionsCache.Instance.PopulateTextRegionProperties(this.region, resolvedUri, populateSnippet: true);
+                    }
+                    catch (ArgumentOutOfRangeException)
+                    {
+                        // in the case there is a mismatch between the file opened on the users device and the file used to create the insight, this can throw an error due to one being larger than the other.
+                        return false;
+                    }
                 }
             }
 

diff --git a/src/Sarif.Viewer.VisualStudio.Core/Tags/SarifLocationErrorTag.cs b/src/Sarif.Viewer.VisualStudio.Core/Tags/SarifLocationErrorTag.cs
@@ -207,10 +207,18 @@ private void ApplyStylingRecurs(Block parentBlock, object obj, Brush textBrush,
         /// <param name="e">The event of being clicked.</param>
         private void Block_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            if (sender is Hyperlink hyperlink)
+            try
             {
-                Process.Start(new ProcessStartInfo(hyperlink.NavigateUri.AbsoluteUri));
-                e.Handled = true;
+                if (sender is Hyperlink hyperlink)
+                {
+                    Process.Start(new ProcessStartInfo(hyperlink.NavigateUri.AbsoluteUri));
+                    e.Handled = true;
+                }
+            }
+            catch (Exception)
+            {
+                // in case that we cannot navigate to the uri for whatever reason we want to swallow as we do not want to crash VS as a whole.
+                Console.Write("hi");
             }
         }
 

diff --git a/....VisualStudio.ResultSources.DeveloperCanvas.Core/Services/DevCanvasResultSourceService.cs b/....VisualStudio.ResultSources.DeveloperCanvas.Core/Services/DevCanvasResultSourceService.cs
@@ -254,6 +254,11 @@ private void DownloadInsights(string filePath)
                 }
             }
 
+            if (sourceControlType == SourceControlType.Unknown) // file in question is not a file that is part of a codebase, skip over.
+            {
+                return (null, null); 
+            }
+
             string repoRootedFilePath = GetRepoRootedFilePath(gitRepoRoot, absoluteFilePath);
 
             if (sourceControlType == SourceControlType.Unknown)