Skip to content

fix(desktop): close CloseTab-Snapshot/DeleteSession race window #4400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
myipanta wants to merge 1 commit into from
Closed

fix(desktop): close CloseTab-Snapshot/DeleteSession race window #4400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion desktop/tabs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,6 +1251,14 @@ func (a *App) CloseTab(tabID string) error {
a.mu.Unlock()
return fmt.Errorf("cannot close the last tab")
}
// Snapshot the session state before removing the tab from a.tabs.
// This closes a race window with DeleteSession: if Snapshot runs
// after delete(a.tabs, tabID), a concurrent DeleteSession can delete
// the session files, and the deferred Snapshot recreates them.
if tab.Ctrl != nil {
_ = tab.Ctrl.Snapshot()
}

ordered := a.orderedTabIDsLocked()
closedIndex := -1
for i, id := range ordered {
Expand Down Expand Up @@ -1280,7 +1288,6 @@ func (a *App) CloseTab(tabID string) error {

// Tear down outside the lock.
if tab.Ctrl != nil {
_ = tab.Ctrl.Snapshot()
if tab.hasActiveRuntimeWork() && a.detachSessionRuntime(tab) {
return nil
}
Expand Down
Loading