Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Seat: fix potential crash in handleMapping()

Browse Source 
I haven't actually managed to reproduce a crash here yet but I feel much
more comfortable about this code with this change.
This commit is contained in:
Isaac Freund 2024-01-07 16:55:10 -06:00
parent dd9933b6a1
commit 5947f04408
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
river/Seat.zig
View File

@ -368,21 +368,34 @@ pub fn handleMapping(
xkb_state: *xkb.State, xkb_state: *xkb.State,
) bool { ) bool {
const modes = &server.config.modes; const modes = &server.config.modes;
// In case more than one mapping matches, all of them are activated // It is possible for more than one mapping to be matched due to the existence of
var handled = false; // layout-independent mappings. In this case run the first match and log a warning
// if there are other matches.
var found: ?*Mapping = null;
for (modes.items[self.mode_id].mappings.items) |*mapping| { for (modes.items[self.mode_id].mappings.items) |*mapping| {
if (mapping.match(keycode, modifiers, released, xkb_state)) { if (mapping.match(keycode, modifiers, released, xkb_state)) {
if (mapping.options.repeat) { if (found == null) {
self.repeating_mapping = mapping; found = mapping;
self.mapping_repeat_timer.timerUpdate(server.config.repeat_delay) catch { } else {
log.err("failed to update mapping repeat timer", .{}); log.warn("already found a matching mapping, ignoring additional match", .{});
};
} }
self.runCommand(mapping.command_args);
handled = true;
} }
} }
return handled;
// The mapped command must be run outside of the loop above as it may modify
// the list of mappings we are iterating through, possibly causing it to be re-allocated.
if (found) |mapping| {
if (mapping.options.repeat) {
self.repeating_mapping = mapping;
self.mapping_repeat_timer.timerUpdate(server.config.repeat_delay) catch {
log.err("failed to update mapping repeat timer", .{});
};
}
self.runCommand(mapping.command_args);
return true;
}
return false;
} }
/// Handle any user-defined mapping for switches /// Handle any user-defined mapping for switches