From 0d4f08ad9c4b8e9c40286b7a82e598bdd7909151 Mon Sep 17 00:00:00 2001
From: Ryan Hirasaki <ryanhirasaki@gmail.com>
Date: Thu, 16 Sep 2021 11:32:57 -0500
Subject: [PATCH] [hal] Simplify string copy of joystick name (#3575)

---
 hal/src/main/native/athena/FRCDriverStation.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hal/src/main/native/athena/FRCDriverStation.cpp b/hal/src/main/native/athena/FRCDriverStation.cpp
index c2251667ba..87abf439d4 100644
--- a/hal/src/main/native/athena/FRCDriverStation.cpp
+++ b/hal/src/main/native/athena/FRCDriverStation.cpp
@@ -300,10 +300,9 @@ char* HAL_GetJoystickName(int32_t joystickNum) {
     name[0] = '\0';
     return name;
   } else {
-    size_t len = std::strlen(joystickDesc.name);
-    char* name = static_cast<char*>(std::malloc(len + 1));
+    const size_t len = std::strlen(joystickDesc.name) + 1;
+    char* name = static_cast<char*>(std::malloc(len));
     std::memcpy(name, joystickDesc.name, len);
-    name[len] = '\0';
     return name;
   }
 }