Zengtudor
/
glfw
mirror of https://github.com/glfw/glfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix path buffer length warning

This commit is contained in:
Camilla Löwy 2017-06-11 23:15:44 +02:00
parent 2ca9a0979e
commit 78666204a1
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/linux_joystick.c
View File

@ -161,18 +161,14 @@ GLFWbool _glfwInitJoysticksLinux(void)
while ((entry = readdir(dir))) while ((entry = readdir(dir)))
{ {
regmatch_t match; regmatch_t match;
char* path = NULL;
if (regexec(&_glfw.linjs.regex, entry->d_name, 1, &match, 0) != 0) if (regexec(&_glfw.linjs.regex, entry->d_name, 1, &match, 0) != 0)
continue; continue;
if (asprintf(&path, "%s/%s", dirname, entry->d_name) < 0) const size_t length = strlen(dirname) + strlen(entry->d_name) + 1;
{ char* path = calloc(length + 1, 1);
_glfwInputError(GLFW_PLATFORM_ERROR,
"Linux: Failed to construct device path: %s", snprintf(path, length + 1, "%s/%s", dirname, entry->d_name);
strerror(errno));
continue;
}
if (openJoystickDevice(path)) if (openJoystickDevice(path))
count++; count++;