aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-12-29 17:04:17 -0500
committerSimon Ser <contact@emersion.fr>2019-12-29 23:33:26 +0100
commite0e5a167ed4bf4be85e1db6565cf169c5c84d9ec (patch)
tree6e61f23db44116cc7ddf15375ec85fd4565d9644
parent471f9a3f6a0f5e8e25bf66d7193cf5de0260bf79 (diff)
wlr_keyboard_group: fix mem leak in refresh_state
This fixes a memory leak the refresh_state function for wlr_keyboard_group. The event struct was being dynamically allocated and never free'd. This changes it to a static allocation.
-rw-r--r--types/wlr_keyboard_group.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/types/wlr_keyboard_group.c b/types/wlr_keyboard_group.c
index f7c3c1f6..144132fe 100644
--- a/types/wlr_keyboard_group.c
+++ b/types/wlr_keyboard_group.c
@@ -200,19 +200,15 @@ static void handle_keyboard_repeat_info(struct wl_listener *listener,
static void refresh_state(struct keyboard_group_device *device,
enum wlr_key_state state) {
for (size_t i = 0; i < device->keyboard->num_keycodes; i++) {
- struct wlr_event_keyboard_key *event =
- calloc(1, sizeof(struct wlr_event_keyboard_key));
- if (!event) {
- wlr_log(WLR_ERROR, "Failed to allocate wlr_event_keyboard_key");
- continue; // TODO: Handle corrupt state somehow
- }
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
- event->time_msec = (int64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000;
- event->keycode = device->keyboard->keycodes[i];
- event->update_state = true;
- event->state = state;
- handle_keyboard_key(&device->key, event);
+ struct wlr_event_keyboard_key event = {
+ .time_msec = (int64_t)now.tv_sec * 1000 + now.tv_nsec / 1000000,
+ .keycode = device->keyboard->keycodes[i],
+ .update_state = true,
+ .state = state
+ };
+ handle_keyboard_key(&device->key, &event);
}
}