godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-02 16:48:55 +00:00
Code Releases Wiki Activity

Wayland: Fix trailing garbage error while using the embedder on Jay

Browse Source 
`send_wayland_message` takes in the number of words, not its byte size.
This meant that we were sending quite a bit of out-of-bounds stuff
alongside the four arguments required by
`xdg_positioner::set_anchor_rect`, which triggered an assertion on Jay.

This didn't pop up before because the C wayland server library does not
seem to check this, but it's a valid (and useful!) assertion
for other server implementations nonetheless.

This patch switches to the initializer_list syntax to make the intent
clearer.
This commit is contained in:
Dery Almas
2025-11-24 22:38:56 +01:00
parent bbe9654327
commit 1fb101f7a5
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/linuxbsd/wayland/wayland_embedder.cpp
View File

@@ -1207,7 +1207,6 @@ WaylandEmbedder::MessageStatus WaylandEmbedder::handle_request(LocalObjectHandle
DEBUG_LOG_WAYLAND_EMBED(vformat("Client #%d -> %s::%s(%s) l0x%x g0x%x", client->socket, interface->name, message.name, message.signature, local_id, global_id)); DEBUG_LOG_WAYLAND_EMBED(vformat("Client #%d -> %s::%s(%s) l0x%x g0x%x", client->socket, interface->name, message.name, message.signature, local_id, global_id));
const uint32_t *body = msg_data + 2; const uint32_t *body = msg_data + 2;
size_t body_len = msg_len - (WL_WORD_SIZE * 2);
if (registry_globals_names.has(global_id)) { if (registry_globals_names.has(global_id)) {
int global_name = registry_globals_names[global_id]; int global_name = registry_globals_names[global_id];
@@ -1623,7 +1622,7 @@ WaylandEmbedder::MessageStatus WaylandEmbedder::handle_request(LocalObjectHandle
// Args: int x, int y, int width, int height. // Args: int x, int y, int width, int height.
pos_data->anchor_rect = Rect2i(body[0], body[1], body[2], body[3]); pos_data->anchor_rect = Rect2i(body[0], body[1], body[2], body[3]);
send_wayland_message(compositor_socket, global_id, p_opcode, body, body_len); send_wayland_message(compositor_socket, global_id, p_opcode, { body[0], body[1], body[2], body[3] });
return MessageStatus::HANDLED; return MessageStatus::HANDLED;
} }
} }