godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Wayland: Check selection devices before using them

Browse Source 
Looks like we never actually stopped the code from using bad pointers.
I even forgot the check in the primary selection code 🤦
This commit is contained in:
Riteo Siuga
2025-01-18 23:46:03 +01:00
parent 7b1ed520bd
commit bed2a1927f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/linuxbsd/wayland/wayland_thread.cpp
View File

@@ -4111,6 +4111,7 @@ void WaylandThread::selection_set_text(const String &p_text) {
if (registry.wl_data_device_manager == nullptr) { if (registry.wl_data_device_manager == nullptr) {
DEBUG_LOG_WAYLAND_THREAD("Couldn't set selection, wl_data_device_manager global not available."); DEBUG_LOG_WAYLAND_THREAD("Couldn't set selection, wl_data_device_manager global not available.");
return;
} }
if (ss == nullptr) { if (ss == nullptr) {
@@ -4238,6 +4239,11 @@ void WaylandThread::primary_set_text(const String &p_text) {
return; return;
} }
if (ss->wp_primary_selection_device == nullptr) {
DEBUG_LOG_WAYLAND_THREAD("Couldn't set primary selection, seat doesn't have wp_primary_selection_device.");
return;
}
ss->primary_data = p_text.to_utf8_buffer(); ss->primary_data = p_text.to_utf8_buffer();
if (ss->wp_primary_selection_source == nullptr) { if (ss->wp_primary_selection_source == nullptr) {
@@ -4245,10 +4251,10 @@ void WaylandThread::primary_set_text(const String &p_text) {
zwp_primary_selection_source_v1_add_listener(ss->wp_primary_selection_source, &wp_primary_selection_source_listener, ss); zwp_primary_selection_source_v1_add_listener(ss->wp_primary_selection_source, &wp_primary_selection_source_listener, ss);
zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain;charset=utf-8"); zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain;charset=utf-8");
zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain"); zwp_primary_selection_source_v1_offer(ss->wp_primary_selection_source, "text/plain");
}
// TODO: Implement a good way of getting the latest serial from the user. // TODO: Implement a good way of getting the latest serial from the user.
zwp_primary_selection_device_v1_set_selection(ss->wp_primary_selection_device, ss->wp_primary_selection_source, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial)); zwp_primary_selection_device_v1_set_selection(ss->wp_primary_selection_device, ss->wp_primary_selection_source, MAX(ss->pointer_data.button_serial, ss->last_key_pressed_serial));
}
// Wait for the message to get to the server before continuing, otherwise the // Wait for the message to get to the server before continuing, otherwise the
// clipboard update might come with a delay. // clipboard update might come with a delay.