Skip to content

Fix: Unhandled completion handlers cause crashes when delegate is deallocated #233

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

Merged
svara merged 2 commits into from
Jul 2, 2026
Merged

Fix: Unhandled completion handlers cause crashes when delegate is deallocated #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34d97ae
Fix WebKit completion handlers to also be called when delegate is nil
Mar 5, 2026
ccdabcf
Guard auth challenge completion handler across the delegate chain
svara Jul 2, 2026
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
6 changes: 5 additions & 1 deletion Source/Turbo/Navigator/Navigator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,11 @@ extension Navigator: SessionDelegate {
}

public func session(_ session: Session, didReceiveAuthenticationChallenge challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
delegate?.didReceiveAuthenticationChallenge(challenge, completionHandler: completionHandler)
guard let delegate else {
completionHandler(.performDefaultHandling, nil)
return
}
delegate.didReceiveAuthenticationChallenge(challenge, completionHandler: completionHandler)
}

public func sessionDidFinishRequest(_ session: Session) {
Expand Down
12 changes: 10 additions & 2 deletions Source/Turbo/Navigator/WKUIController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,29 @@ open class WKUIController: NSObject, WKUIDelegate {
}

open func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
guard let delegate else {
completionHandler()
return
}
let alert = UIAlertController(title: message, message: nil, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "Close", style: .default) { _ in
completionHandler()
})
delegate?.present(alert, animated: true)
delegate.present(alert, animated: true)
}

open func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
guard let delegate else {
completionHandler(false)
return
}
let alert = UIAlertController(title: message, message: nil, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: "OK", style: .default) { _ in
completionHandler(true)
})
alert.addAction(UIAlertAction(title: "Cancel", style: .cancel) { _ in
completionHandler(false)
})
delegate?.present(alert, animated: true)
delegate.present(alert, animated: true)
}
}
6 changes: 5 additions & 1 deletion Source/Turbo/Session/Session.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,11 @@ extension Session: VisitDelegate {
}

func visit(_ visit: Visit, didReceiveAuthenticationChallenge challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
delegate?.session(self, didReceiveAuthenticationChallenge: challenge, completionHandler: completionHandler)
guard let delegate else {
completionHandler(.performDefaultHandling, nil)
return
}
delegate.session(self, didReceiveAuthenticationChallenge: challenge, completionHandler: completionHandler)
}

func visitDidProposeVisitToLocation(_ location: URL) {
Expand Down
6 changes: 5 additions & 1 deletion Source/Turbo/Visit/ColdBootVisit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ extension ColdBootVisit: WKNavigationDelegate {
}

func webView(_ webView: WKWebView, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
delegate?.visit(self, didReceiveAuthenticationChallenge: challenge, completionHandler: completionHandler)
guard let delegate else {
completionHandler(.performDefaultHandling, nil)
return
}
delegate.visit(self, didReceiveAuthenticationChallenge: challenge, completionHandler: completionHandler)
}
}

Expand Down
Loading