fix(webkit): add IsDestroyed safety checks to keyboard blocking handlers to prevent crashes on destroyed WebViews

2 files · +5 -2

M pkg/webkit/keyboard_cgo.go +1 -1


@@ -758,7 +758,7 @@ func handleRenderingBackendMessage(payload string) bool {
758	758
759	759		// handleKeyboardBlockingMessage handles keyboard blocking control messages from omnibox
760	760		func handleKeyboardBlockingMessage(vw *WebView, payload string) bool {
761		-	if vw == nil {
	761	+	if vw == nil \|\| vw.IsDestroyed() {
762	762		return false
763	763		}
764	764


@@ -758,7 +758,7 @@ func handleRenderingBackendMessage(payload string) bool {
758			758
759		// handleKeyboardBlockingMessage handles keyboard blocking control messages from omnibox	759		// handleKeyboardBlockingMessage handles keyboard blocking control messages from omnibox
760		func handleKeyboardBlockingMessage(vw *WebView, payload string) bool {	760		func handleKeyboardBlockingMessage(vw *WebView, payload string) bool {
761	-	if vw == nil {	761	+	if vw == nil \|\| vw.IsDestroyed() {
762		return false	762		return false
763		}	763		}
764			764

M pkg/webkit/shortcuts_cgo.go +4 -1


@@ -529,7 +529,10 @@ func (w *WebView) DisablePageKeyboardBlocking() error {
529	529		console.log('[dumber] Page keyboard event blocking disabled');
530	530		}
531	531		`
532		-	w.InjectScript(cleanupScript)
	532	+	// Double-check WebView is still valid before script injection
	533	+	if !w.IsDestroyed() {
	534	+	w.InjectScript(cleanupScript)
	535	+	}
533	536
534	537		// Remove the user script if it exists
535	538		if keyboardBlockerScript != nil {

 			console.log('[dumber] Page keyboard event blocking disabled');
 		}
 	`
-	w.InjectScript(cleanupScript)
+	// Double-check WebView is still valid before script injection
+	if !w.IsDestroyed() {
+		w.InjectScript(cleanupScript)
+	}
 	// Remove the user script if it exists
 	if keyboardBlockerScript != nil {