Fix string literal exceeding max length

Fixes glfw#1145.
SlySlyBreadAndPi · Nov 23, 2017 · 3169179 · 3169179
1 parent fe9c7a0
commit 3169179
Show file tree

Hide file tree

Showing 4 changed files with 270 additions and 257 deletions.
diff --git a/CMake/GenerateMappings.cmake b/CMake/GenerateMappings.cmake
@@ -24,7 +24,7 @@ endif()
 file(STRINGS "${source_path}" lines)
 foreach(line ${lines})
     if ("${line}" MATCHES "^[0-9a-fA-F].*$")
-        set(GLFW_GAMEPAD_MAPPINGS "${GLFW_GAMEPAD_MAPPINGS}\"${line}\\n\"\n")
+        set(GLFW_GAMEPAD_MAPPINGS "${GLFW_GAMEPAD_MAPPINGS}\"${line}\",\n")
     endif()
 endforeach()
 

diff --git a/src/init.c b/src/init.c
@@ -220,10 +220,17 @@ GLFWAPI int glfwInit(void)
 
     glfwDefaultWindowHints();
 
-    if (!glfwUpdateGamepadMappings(_glfwDefaultMappings))
     {
-        terminate();
-        return GLFW_FALSE;
+        int i;
+
+        for (i = 0;  _glfwDefaultMappings[i];  i++)
+        {
+            if (!glfwUpdateGamepadMappings(_glfwDefaultMappings[i]))
+            {
+                terminate();
+                return GLFW_FALSE;
+            }
+        }
     }
 
     return GLFW_TRUE;