From 25964e5a2b633aed191915efa0de0489bf94dbb9 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Sat, 4 May 2024 12:35:56 +0100
Subject: [PATCH] hid: don't access expired resources in virtual devices

fixes #5868
---
 src/devices/VirtualKeyboard.cpp | 4 ++++
 src/devices/VirtualPointer.cpp  | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/devices/VirtualKeyboard.cpp b/src/devices/VirtualKeyboard.cpp
index ca6156b7..fa91ae9f 100644
--- 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
index 8f8699a2..2b46ff28 100644
--- 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();
 }