geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crash if there is no controller mapping

main
Sam Lantinga 2023-11-10 15:38:24 -08:00
parent 312faf9305
commit a5a47d3bee
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/gamepadutils.c
View File

@ -766,6 +766,10 @@ static SDL_bool GetButtonBindingString(SDL_GamepadButton button, char *mapping,
char label[32]; char label[32];
SDL_bool baxy_mapping = SDL_FALSE; SDL_bool baxy_mapping = SDL_FALSE;
if (!mapping) {
return SDL_FALSE;
}
SDL_snprintf(label, sizeof(label), ",%s:", SDL_GetGamepadStringForButton(button)); SDL_snprintf(label, sizeof(label), ",%s:", SDL_GetGamepadStringForButton(button));
if (GetBindingString(label, mapping, text, size)) { if (GetBindingString(label, mapping, text, size)) {
return SDL_TRUE; return SDL_TRUE;
@ -2543,7 +2547,7 @@ static SDL_bool MappingHasKey(const char *mapping, const char *key)
if (i < 0) { if (i < 0) {
SDL_bool baxy_mapping = SDL_FALSE; SDL_bool baxy_mapping = SDL_FALSE;
if (SDL_strstr(mapping, ",hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1") != NULL) { if (mapping && SDL_strstr(mapping, ",hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1") != NULL) {
baxy_mapping = SDL_TRUE; baxy_mapping = SDL_TRUE;
} }
i = FindMappingKey(&parts, GetLegacyKey(key, baxy_mapping)); i = FindMappingKey(&parts, GetLegacyKey(key, baxy_mapping));
@ -2567,7 +2571,7 @@ static char *GetMappingValue(const char *mapping, const char *key)
if (i < 0) { if (i < 0) {
SDL_bool baxy_mapping = SDL_FALSE; SDL_bool baxy_mapping = SDL_FALSE;
if (SDL_strstr(mapping, ",hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1") != NULL) { if (mapping && SDL_strstr(mapping, ",hint:SDL_GAMECONTROLLER_USE_BUTTON_LABELS:=1") != NULL) {
baxy_mapping = SDL_TRUE; baxy_mapping = SDL_TRUE;
} }
i = FindMappingKey(&parts, GetLegacyKey(key, baxy_mapping)); i = FindMappingKey(&parts, GetLegacyKey(key, baxy_mapping));