From 3fc0f05fab8be51b6e319159c1f3b20d530ec343 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 5 Feb 2021 15:38:27 +1100 Subject: [PATCH] Fix potential nil conditions in webview --- lib/renderer/webview/webview.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/renderer/webview/webview.go b/lib/renderer/webview/webview.go index f8ac2b70..e9a760ab 100755 --- a/lib/renderer/webview/webview.go +++ b/lib/renderer/webview/webview.go @@ -353,7 +353,9 @@ func _webviewDispatchGoCallback(index unsafe.Pointer) { f = fns[uintptr(index)] delete(fns, uintptr(index)) m.Unlock() - f() + if f != nil { + f() + } } //export _webviewExternalInvokeCallback @@ -369,5 +371,7 @@ func _webviewExternalInvokeCallback(w unsafe.Pointer, data unsafe.Pointer) { } } m.Unlock() - cb(wv, C.GoString((*C.char)(data))) + if cb != nil { + cb(wv, C.GoString((*C.char)(data))) + } }