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

Do not cache atom name if XInternAtom fails

Browse Source 
If `XInternAtom` is called with `onlyIfExists` set, then it can
legitimately return `None`. We should not cache this value because it
might change in the future.

This bug can sometimes be triggered because we use
`getAtom("UTF8_STRING", true)` and `getAtom("UTF8_STRING")`. If the
first call caches `None` because the atom didn't exist, then the
second call could return `None` instead of creating a new atom like it
should.
This commit is contained in:
James Cowgill 2024-11-30 19:29:16 +00:00 committed by Lukas Dürrenberger
parent f88b768ba6
commit ad70442246
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,8 @@ Atom getAtom(const std::string& name, bool onlyIfExists)
const auto display = openDisplay(); const auto display = openDisplay();
const Atom atom = XInternAtom(display.get(), name.c_str(), onlyIfExists ? True : False); const Atom atom = XInternAtom(display.get(), name.c_str(), onlyIfExists ? True : False);
atoms[name] = atom; if (atom)
atoms[name] = atom;
return atom; return atom;
} }