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

Avoid const_cast, static buffer and buffer overlap

Browse Source
This commit is contained in:
Emmanuel Atse 2013-07-18 16:23:57 +02:00
parent 43a21e2acc
commit 5a42c91985
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SFML/Window/Linux/WindowImplX11.cpp
View File

@ -60,21 +60,18 @@ namespace
} }
// Find the name of the current executable // Find the name of the current executable
const char* findExecutableName() void findExecutableName(char* buffer, std::size_t bufferSize)
{ {
//Default fallback name //Default fallback name
const char* executableName = "sfml"; const char* executableName = "sfml";
static char buffer[512]; std::size_t length = readlink("/proc/self/exe", buffer, bufferSize);
std::size_t length = readlink("/proc/self/exe", buffer, sizeof(buffer)); if ((length > 0) && (length < bufferSize))
if ((length > 0) && (length < sizeof(buffer)))
{ {
// Remove the path to keep the executable name only // Remove the path to keep the executable name only
buffer[length] = '\0'; buffer[length] = '\0';
executableName = basename(buffer); executableName = basename(buffer);
} }
std::memcpy(buffer, executableName, std::strlen(executableName) + 1); std::memmove(buffer, executableName, std::strlen(executableName) + 1);
return buffer;
} }
} }
@ -249,10 +246,11 @@ m_previousSize(-1, -1)
} }
// Set the window's WM class (this can be used by window managers) // Set the window's WM class (this can be used by window managers)
const char* windowClass = findExecutableName(); char windowClass[512];
findExecutableName(windowClass, sizeof(windowClass));
XClassHint* classHint = XAllocClassHint(); XClassHint* classHint = XAllocClassHint();
classHint->res_name = const_cast<char*>(windowClass); classHint->res_name = windowClass;
classHint->res_class = const_cast<char*>(windowClass); classHint->res_class = windowClass;
XSetClassHint(m_display, m_window, classHint); XSetClassHint(m_display, m_window, classHint);
XFree(classHint); XFree(classHint);