Skip to content

fix(Window): add missing lock in Window::WndProc for thread safety #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
shc0743 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix(Window): add missing lock in Window::WndProc for thread safety #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion GUI/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,12 @@ LRESULT Window::WndProc(UINT msg, WPARAM wParam, LPARAM lParam) {
notifCode = hdr.code;
}
try {
Window* target = managed.at(targetWindow); // 不需要锁
Window* target = nullptr;
{
lock_guard gg(managed_lock);
target = managed.at(targetWindow);
}
// FIXME: 这里可能target被销毁，如果target在这里被销毁，下一行代码会崩溃
return target->dispatchMessageToWindowAndGetResult(msg_t(notifCode + WINDOW_NOTIFICATION_CODES), (UINT)msg, lParam, true);
}
catch (std::out_of_range&) {
Expand Down