Skip to content

Fix SIGTRAP crash from continuation misuse in connection handling #151

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

Open
sciencemanx wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −0
Open

Fix SIGTRAP crash from continuation misuse in connection handling #151

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
12 changes: 12 additions & 0 deletions App/Controllers/ServerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,8 @@ actor MCPConnectionManager {
self.transport = NetworkTransport(
connection: connection,
logger: nil,
heartbeatConfig: .init(enabled: false),
reconnectionConfig: .disabled,
bufferConfig: .unlimited
)

Expand Down Expand Up @@ -627,6 +629,7 @@ actor ServerNetworkManager {
private var connections: [UUID: MCPConnectionManager] = [:]
private var connectionTasks: [UUID: Task<Void, Never>] = [:]
private var pendingConnections: [UUID: String] = [:]
private var removedConnections: Set<UUID> = []

typealias ConnectionApprovalHandler = @Sendable (UUID, MCP.Client.Info) async -> Bool
private var connectionApprovalHandler: ConnectionApprovalHandler?
Expand Down Expand Up @@ -764,11 +767,20 @@ actor ServerNetworkManager {
connections.removeAll()
connectionTasks.removeAll()
pendingConnections.removeAll()
removedConnections.removeAll()

await discoveryManager?.stop()
}

func removeConnection(_ id: UUID) async {
// Guard against redundant removal — calling stop() on an already-stopped
// connection can trigger a double-resume in the SDK's transport continuation.
guard !removedConnections.contains(id) else {
log.debug("Connection \(id) already removed, skipping")
return
}
removedConnections.insert(id)

log.debug("Removing connection: \(id)")

if let connectionManager = connections[id] {
Expand Down