mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2025-01-18 15:25:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix segfault if XOpenIM fails

Browse Source 
If `XOpenIM` fails we will store a `nullptr` into `sharedXIM`. When
the shared `XIM` is destroyed we call the deleter `XCloseIM` on the
`nullptr` which segfaults.

Fix this by adding a new `closeIM` helper function which checks for
null first.
This commit is contained in:
James Cowgill 2024-12-04 23:13:01 +00:00 committed by Lukas Dürrenberger
parent ad70442246
commit e1bb69b3b5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SFML/Window/Unix/Display.cpp
View File

@ -104,7 +104,12 @@ std::shared_ptr<_XIM> openXim()
XSetLocaleModifiers(""); XSetLocaleModifiers("");
// Create the input context // Create the input context
sharedXIM.reset(XOpenIM(UnixDisplayImpl::weakSharedDisplay.lock().get(), nullptr, nullptr, nullptr), XCloseIM); const auto closeIM = [](XIM im)
{
if (im)
XCloseIM(im);
};
sharedXIM.reset(XOpenIM(UnixDisplayImpl::weakSharedDisplay.lock().get(), nullptr, nullptr, nullptr), closeIM);
xim = sharedXIM; xim = sharedXIM;
// Restore the previous locale // Restore the previous locale