mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-29 03:11:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipc: Handle unsupported binding event types

Browse source 
Handle binding event types that cannot be encoded gracefully by dropping
the event. This prevents issues for binding types like BINDING_SWITCH,
where the event would cause a crash.
This commit is contained in:
Nathan Rossi 2020-01-30 23:50:07 +10:00 committed by Simon Ser
parent 1dbc7f7521
commit ffbf10d07b
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sway/ipc-server.c
View file

@ -421,7 +421,8 @@ void ipc_event_binding(struct sway_binding *binding) {
json_object *symbols = json_object_new_array(); json_object *symbols = json_object_new_array();
json_object *symbol = NULL; json_object *symbol = NULL;
if (binding->type == BINDING_KEYCODE) { // bindcode: populate input_codes switch (binding->type) {
case BINDING_KEYCODE:; // bindcode: populate input_codes
uint32_t keycode; uint32_t keycode;
for (int i = 0; i < binding->keys->length; ++i) { for (int i = 0; i < binding->keys->length; ++i) {
keycode = *(uint32_t *)binding->keys->items[i]; keycode = *(uint32_t *)binding->keys->items[i];
@ -430,7 +431,11 @@ void ipc_event_binding(struct sway_binding *binding) {
input_code = keycode; input_code = keycode;
} }
} }
} else { // bindsym/mouse: populate symbols break;
case BINDING_KEYSYM:
case BINDING_MOUSESYM:
case BINDING_MOUSECODE:; // bindsym/mouse: populate symbols
uint32_t keysym; uint32_t keysym;
char buffer[64]; char buffer[64];
for (int i = 0; i < binding->keys->length; ++i) { for (int i = 0; i < binding->keys->length; ++i) {
@ -451,6 +456,14 @@ void ipc_event_binding(struct sway_binding *binding) {
json_object_array_add(symbols, str); json_object_array_add(symbols, str);
} }
} }
break;
default:
sway_log(SWAY_DEBUG, "Unsupported ipc binding event");
json_object_put(input_codes);
json_object_put(symbols);
json_object_put(json_binding);
return; // do not send any event
} }
json_object_object_add(json_binding, "input_codes", input_codes); json_object_object_add(json_binding, "input_codes", input_codes);