pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor sanity checking and tweaks in SDL_JoystickGetGUIDString().

Browse source
This commit is contained in:
Ryan C. Gordon 2012-12-11 18:46:09 -05:00
parent c773de800d
commit 7cb9995377
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/joystick/SDL_joystick.c
View file

@ -698,22 +698,22 @@ SDL_JoystickGUID SDL_JoystickGetGUID(SDL_Joystick * joystick)
void SDL_JoystickGetGUIDString( SDL_JoystickGUID guid, char *pszGUID, int cbGUID ) void SDL_JoystickGetGUIDString( SDL_JoystickGUID guid, char *pszGUID, int cbGUID )
{ {
static const char k_rgchHexToASCII[] = "0123456789abcdef"; static const char k_rgchHexToASCII[] = "0123456789abcdef";
char *pchOut = NULL;
char *pchString = NULL;
int i; int i;
pchOut = pszGUID;
for ( i = 0; i < sizeof(guid) && i < (cbGUID-1); i++ ) if ((pszGUID == NULL) || (cbGUID <= 0)) {
return;
}
for ( i = 0; i < sizeof(guid.data) && i < (cbGUID-1); i++ )
{ {
// each input byte writes 2 ascii chars, and might write a null byte. // each input byte writes 2 ascii chars, and might write a null byte.
// If we don't have room for next input byte, stop // If we don't have room for next input byte, stop
unsigned char c = guid.data[i]; unsigned char c = guid.data[i];
*pchOut++ = k_rgchHexToASCII[ c >> 4 ]; *pszGUID++ = k_rgchHexToASCII[ c >> 4 ];
*pchOut++ = k_rgchHexToASCII[ c & 0x0F ]; *pszGUID++ = k_rgchHexToASCII[ c & 0x0F ];
} }
*pchOut = '\0'; *pszGUID = '\0';
} }