Check for cancellation before accessing non-locals

in order to avoid #11460
gitextensions · Dec 20, 2023 · 2cb7fff · 2cb7fff
1 parent ee337ca
commit 2cb7fff
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -1000,6 +1000,7 @@ public void PerformRefreshRevisions(Func<RefsFilter, IReadOnlyList<IGitRef>> get
                         ? getUnfilteredRefs.Value.Where(r => r.CompleteName != GitRefName.RefsStashPrefix)
                         : getUnfilteredRefs.Value)
                         .ToLookup(gitRef => gitRef.ObjectId);
+                    cancellationToken.ThrowIfCancellationRequested();
                     ResetNavigationHistory();
                     UpdateSelectedRef(capturedModule, getUnfilteredRefs.Value, headRef.Value);
                     _gridView.ToBeSelectedObjectIds = GetToBeSelectedRevisions(CurrentCheckout, currentlySelectedObjectIds);
@@ -1077,6 +1078,7 @@ public void PerformRefreshRevisions(Func<RefsFilter, IReadOnlyList<IGitRef>> get
                     {
                         RevisionReader reader = new(capturedModule);
                         string pathFilter = BuildPathFilter(_filterInfo.PathFilter);
+                        cancellationToken.ThrowIfCancellationRequested();
                         ParentsAreRewritten = _filterInfo.HasRevisionFilter;
 
                         cancellationToken.ThrowIfCancellationRequested();
@@ -1126,6 +1128,7 @@ static void UpdateSelectedRef(IGitModule module, IReadOnlyList<IGitRef> gitRefs,
 
             string BuildPathFilter(string? path)
             {
+                cancellationToken.ThrowIfCancellationRequested();
                 FilePathByObjectId?.Clear();
 
                 if (string.IsNullOrWhiteSpace(path))
@@ -1219,6 +1222,7 @@ string BuildPathFilter(string? path)
                     }
 
                     // Add only the first file to the dictionary
+                    cancellationToken.ThrowIfCancellationRequested();
                     FilePathByObjectId?.TryAdd(currentObjectId, line);
                     setOfFileNames.Add(line);
                 }