From db16996181795b2d2d6e7efcdd34db459d420114 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 6 Mar 2019 08:40:02 +0530 Subject: [PATCH] Fix Coverity Scan false positive From upstream: https://github.com/glfw/glfw/commit/c20754c4a65784f46519397cee285018670d2cfb --- glfw/cocoa_joystick.m | 2 +- glfw/input.c | 2 +- glfw/win32_joystick.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/glfw/cocoa_joystick.m b/glfw/cocoa_joystick.m index 96dbd545f..d27bca3d9 100644 --- a/glfw/cocoa_joystick.m +++ b/glfw/cocoa_joystick.m @@ -464,7 +464,7 @@ void _glfwPlatformUpdateGamepadGUID(char* guid) (strncmp(guid + 20, "000000000000", 12) == 0)) { char original[33]; - strcpy(original, guid); + strncpy(original, guid, sizeof(original) - 1); sprintf(guid, "03000000%.4s0000%.4s000000000000", original, original + 16); } diff --git a/glfw/input.c b/glfw/input.c index 04eb8c4e2..5d007cb4c 100644 --- a/glfw/input.c +++ b/glfw/input.c @@ -415,7 +415,7 @@ _GLFWjoystick* _glfwAllocJoystick(const char* name, js->buttonCount = buttonCount; js->hatCount = hatCount; - strcpy(js->guid, guid); + strncpy(js->guid, guid, sizeof(js->guid) - 1); js->mapping = findValidMapping(js); return js; diff --git a/glfw/win32_joystick.c b/glfw/win32_joystick.c index d9d341ff5..11997c7a5 100644 --- a/glfw/win32_joystick.c +++ b/glfw/win32_joystick.c @@ -743,9 +743,8 @@ void _glfwPlatformUpdateGamepadGUID(char* guid) if (strcmp(guid + 20, "504944564944") == 0) { char original[33]; - strcpy(original, guid); + strncpy(original, guid, sizeof(original) - 1); sprintf(guid, "03000000%.4s0000%.4s000000000000", original, original + 4); } } -