Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed current and potential bugs caught by Coverity

Browse Source 
Change-Id: I9f9d09dc797ffea062eeb49c881be1d5acb63d7b
This commit is contained in:
Tyler Veness
2015-11-15 14:49:50 -08:00
committed by Peter Johnson
parent b0fec4089b
commit 055ee09825
34 changed files with 105 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hal/lib/Shared/HAL.cpp
View File

@@ -1,6 +1,7 @@
//This file must compile on ALL PLATFORMS. Be very careful what you put in here.
#include "HAL/HAL.hpp"
#include "FRC_NetworkCommunication/FRCComm.h"
#include <cstring>
int HALGetControlWord(HALControlWord *data)
{
@@ -62,17 +63,20 @@ int HALGetJoystickType(uint8_t joystickNum)
}
}
const char* HALGetJoystickName(uint8_t joystickNum)
char* HALGetJoystickName(uint8_t joystickNum)
{
HALJoystickDescriptor joystickDesc;
if(HALGetJoystickDescriptor(joystickNum, &joystickDesc)<0)
{
const char* retval = "";
return retval;
char* name = (char*)std::malloc(1);
name[0] = '\0';
return name;
} else
{
const char* retval(joystickDesc.name);
return retval;
size_t len = std::strlen(joystickDesc.name);
char* name = (char*)std::malloc(len+1);
std::strcpy(name, joystickDesc.name);
return name;
}
}