drath/libratbag
1
0
Fork 1
mirror of https://github.com/libratbag/libratbag.git synced 2026-11-07 23:23:52 +01:00
Code Issues Projects Releases Wiki Activity

etekcity: check for return values before using them

Browse Source 
If action is NULL, that's a problem.
If etekcity_button_action_to_raw() returns 0, we should not try to write
0x00 in the profile. The proper command for "none" is 0x06. 0x00 is thus
an error.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
This commit is contained in:
Benjamin Tissoires
2015-08-26 13:07:46 -04:00
parent 14c29322fd
commit 7ba2c7cee7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/driver-etekcity.c
View File

@@ -366,7 +366,8 @@ etekcity_read_button(struct ratbag_button *button)
" - button%d: %s (%02x) %s:%d\n",
button->index, print_key(data), data, __FILE__, __LINE__);
action = etekcity_raw_to_button_action(data);
button->action = *action;
if (action)
button->action = *action;
button->type = etekcity_raw_to_button_type(button->index);
}
@@ -377,12 +378,16 @@ etekcity_write_button(struct ratbag_button *button,
struct ratbag_profile *profile = button->profile;
struct ratbag_device *device = profile->device;
struct etekcity_data *drv_data = ratbag_get_drv_data(device);
uint8_t *data;
uint8_t rc, *data;
unsigned index = etekcity_button_to_index(button->index);
data = &drv_data->profiles[profile->index][3 + index * 3];
*data = etekcity_button_action_to_raw(action);
rc = etekcity_button_action_to_raw(action);
if (!rc)
return -EINVAL;
*data = rc;
return 0;
}