From 03c340441324bb2cfc565e73999569a3fb1dccbc Mon Sep 17 00:00:00 2001 From: Gyorgy Szombathelyi Date: Thu, 18 Apr 2019 19:08:00 +0200 Subject: [PATCH] Fix a buffer index error (count = 0 -> buffer index = -1) in joymapping --- usb/joymapping.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usb/joymapping.c b/usb/joymapping.c index 5524eb1..65b8b95 100644 --- a/usb/joymapping.c +++ b/usb/joymapping.c @@ -95,11 +95,10 @@ void virtual_joystick_remap(char *s) { token = strtok (s, ","); while(token!=NULL) { //if (count==0) joystick_mappers[i].vid = strtol(token, NULL, 16); -- VID mapping already done - value = strtol(token, NULL, 16); + value = strtol(token, NULL, 16); if (count==1) { joystick_mappers[i].pid = value; - } - else { + } else if (count >= 2) { //parse sub-tokens sequentially and assign 16-bit value to them joystick_mappers[i].mapping[off+count-2] = value; hid_debugf("parsed: %x/%x %d -> %d",