From a54f98c20301a71efe5e73a8fc5e1bcd66f2bd34 Mon Sep 17 00:00:00 2001
From: "Yang, Ying-chao" <yang.yingchao@qq.com>
Date: Thu, 13 Jun 2024 17:33:47 +0800
Subject: [PATCH] virtualkeyboard: check if VirtualKeyboard is valid before
 accessing client. (#6460)

This fixes crash when restarting fcitx (#6378)
---
 src/protocols/InputMethodV2.cpp   | 4 ++--
 src/protocols/VirtualKeyboard.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/protocols/InputMethodV2.cpp b/src/protocols/InputMethodV2.cpp
index 5d0bd417..24f7ad54 100644
--- a/src/protocols/InputMethodV2.cpp
+++ b/src/protocols/InputMethodV2.cpp
@@ -81,7 +81,7 @@ SP<CInputMethodV2> CInputMethodKeyboardGrabV2::getOwner() {
 }
 
 wl_client* CInputMethodKeyboardGrabV2::client() {
-    return resource->client();
+    return resource->resource() ? resource->client() : nullptr;
 }
 
 CInputMethodPopupV2::CInputMethodPopupV2(SP<CZwpInputPopupSurfaceV2> resource_, SP<CInputMethodV2> owner_, SP<CWLSurfaceResource> surface) : resource(resource_), owner(owner_) {
@@ -373,4 +373,4 @@ void CInputMethodV2Protocol::onGetIME(CZwpInputMethodManagerV2* mgr, wl_resource
     LOGM(LOG, "New IME with resource id {}", id);
 
     events.newIME.emit(RESOURCE);
-}
\ No newline at end of file
+}
diff --git a/src/protocols/VirtualKeyboard.cpp b/src/protocols/VirtualKeyboard.cpp
index 89b14c32..009c277c 100644
--- a/src/protocols/VirtualKeyboard.cpp
+++ b/src/protocols/VirtualKeyboard.cpp
@@ -100,7 +100,7 @@ wlr_keyboard* CVirtualKeyboardV1Resource::wlr() {
 }
 
 wl_client* CVirtualKeyboardV1Resource::client() {
-    return resource->client();
+    return resource->resource() ? resource->client() : nullptr;
 }
 
 void CVirtualKeyboardV1Resource::releasePressed() {
@@ -151,4 +151,4 @@ void CVirtualKeyboardProtocol::onCreateKeeb(CZwpVirtualKeyboardManagerV1* pMgr,
     LOGM(LOG, "New VKeyboard at id {}", id);
 
     events.newKeyboard.emit(RESOURCE);
-}
\ No newline at end of file
+}