Skip to content

Small fixes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kikadf wants to merge 2 commits into
base: build-on-openbsd
Choose a base branch
from
Open

Small fixes #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8275e49
wscons_device_dispatch: fix size passed to read()
kikadf Jan 30, 2026
16805d3
libinput_path_add_device: clean up device resources on error
kikadf Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/wscons.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ wscons_device_dispatch(void *data)
ssize_t len;
int count, i;

len = read(device->fd, wsevents, sizeof(struct wscons_event));
len = read(device->fd, wsevents, sizeof(wsevents));
if (len <= 0 || (len % sizeof(struct wscons_event)) != 0)
return;

Expand Down Expand Up @@ -576,8 +576,18 @@ libinput_path_add_device(struct libinput *libinput,
return device;

err:
if (device != NULL)
close_restricted(libinput, device->fd);
if (device != NULL) {
if (device->source)
libinput_remove_source(libinput, device->source);
if (device->devname) {
free(device->devname);
device->devname = NULL;
}
if (device->fd >= 0)
close_restricted(libinput, device->fd);
} else if (fd >= 0) {
close_restricted(libinput, fd);
}
free(wscons_device);
return NULL;
}
Expand Down