[client] overlay/msg: fix race condition in render
Some checks are pending
build / client (Debug, map[cc:clang cxx:clang++], libdecor) (push) Waiting to run
build / client (Debug, map[cc:clang cxx:clang++], xdg-shell) (push) Waiting to run
build / client (Debug, map[cc:gcc cxx:g++], libdecor) (push) Waiting to run
build / client (Debug, map[cc:gcc cxx:g++], xdg-shell) (push) Waiting to run
build / client (Release, map[cc:clang cxx:clang++], libdecor) (push) Waiting to run
build / client (Release, map[cc:clang cxx:clang++], xdg-shell) (push) Waiting to run
build / client (Release, map[cc:gcc cxx:g++], libdecor) (push) Waiting to run
build / client (Release, map[cc:gcc cxx:g++], xdg-shell) (push) Waiting to run
build / module (push) Waiting to run
build / host-linux (push) Waiting to run
build / host-windows-cross (push) Waiting to run
build / host-windows-native (push) Waiting to run
build / obs (clang) (push) Waiting to run
build / obs (gcc) (push) Waiting to run
build / docs (push) Waiting to run

If an overlay is closed with overlayMsg_close, the message can be freed
while it is still being used by msg_render, resulting in a segfault. Lock
the message list for the duration of msg_render to fix this.
This commit is contained in:
Chris Spencer
2025-02-11 16:08:20 +00:00
committed by Geoffrey McRae
parent 7e9e38faa5
commit 03ca20d3e4
3 changed files with 39 additions and 25 deletions

View File

@@ -85,9 +85,14 @@ static bool msg_needsOverlay(void * udata)
static int msg_render(void * udata, bool interactive, struct Rect * windowRects,
int maxRects)
{
ll_lock(l_msg.messages);
struct Msg * msg;
if (!ll_peek_head(l_msg.messages, (void **)&msg))
if (!ll_peek_head_nl(l_msg.messages, (void **)&msg))
{
ll_unlock(l_msg.messages);
return 0;
}
ImVec2 * screen = overlayGetScreenSize();
igSetNextWindowBgAlpha(0.8f);
@@ -163,7 +168,7 @@ static int msg_render(void * udata, bool interactive, struct Rect * windowRects,
if (destroy)
{
(void)ll_shift(l_msg.messages, NULL);
(void)ll_shift_nl(l_msg.messages, NULL);
freeMsg(msg);
app_invalidateOverlay(false);
}
@@ -171,6 +176,7 @@ static int msg_render(void * udata, bool interactive, struct Rect * windowRects,
overlayGetImGuiRect(windowRects);
igEnd();
ll_unlock(l_msg.messages);
return 1;
}