Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix undefined behavior in ewmhSupported() caused by some window managers not null-terminating strings. Fixes #892

Browse Source
This commit is contained in:
Pierre-Luc Perrier 2015-05-22 15:11:14 +02:00 committed by Lukas Dürrenberger
parent 0df1c97af7
commit cadc4d801c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SFML/Window/Unix/WindowImplX11.cpp
View File

@ -235,9 +235,12 @@ namespace
sf::priv::CloseConnection(connection); sf::priv::CloseConnection(connection);
const char* name = reinterpret_cast<const char*>(xcb_get_property_value(wmName.get())); // It seems the wm name string reply is not necessarily
// null-terminated. The work around is to get its actual
windowManagerName = name; // length to build a proper string
const char* begin = reinterpret_cast<const char*>(xcb_get_property_value(wmName.get()));
const char* end = begin + xcb_get_property_value_length(wmName.get());
windowManagerName = sf::String::fromUtf8(begin, end);
return true; return true;
} }