hid: don't access expired resources in virtual devices

fixes #5868
hyprwm · May 4, 2024 · 25964e5 · 25964e5
1 parent 2d40046
commit 25964e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/devices/VirtualKeyboard.cpp b/src/devices/VirtualKeyboard.cpp
@@ -55,6 +55,8 @@ bool CVirtualKeyboard::isVirtual() {
 }
 
 wlr_keyboard* CVirtualKeyboard::wlr() {
+    if (keyboard.expired())
+        return nullptr;
     return keyboard.lock()->wlr();
 }
 
@@ -67,5 +69,7 @@ void CVirtualKeyboard::disconnectCallbacks() {
 }
 
 wl_client* CVirtualKeyboard::getClient() {
+    if (keyboard.expired())
+        return nullptr;
     return keyboard.lock()->client();
 }
diff --git a/src/devices/VirtualPointer.cpp b/src/devices/VirtualPointer.cpp
@@ -166,5 +166,7 @@ void CVirtualPointer::disconnectCallbacks() {
 }
 
 wlr_pointer* CVirtualPointer::wlr() {
+    if (pointer.expired())
+        return nullptr;
     return pointer.lock()->wlr();
 }