mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libseat: Assert that listener is non-NULL

Browse source
This commit is contained in:
Kenny Levinsen 2020-08-29 20:27:02 +02:00
parent de96b3938b
commit 69d57aaf33
2 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libseat/backend/seatd.c
View file

@ -88,20 +88,6 @@ static struct backend_seatd *backend_seatd_from_libseat_backend(struct libseat *
return (struct backend_seatd *)base; return (struct backend_seatd *)base;
} }
static void handle_enable_seat(struct backend_seatd *backend) {
log_info("Enabling seat");
if (backend->seat_listener != NULL && backend->seat_listener->enable_seat != NULL) {
backend->seat_listener->enable_seat(&backend->base, backend->seat_listener_data);
}
}
static void handle_disable_seat(struct backend_seatd *backend) {
log_info("Disabling seat");
if (backend->seat_listener != NULL && backend->seat_listener->disable_seat != NULL) {
backend->seat_listener->disable_seat(&backend->base, backend->seat_listener_data);
}
}
static size_t read_header(struct connection *connection, uint16_t expected_opcode) { static size_t read_header(struct connection *connection, uint16_t expected_opcode) {
struct proto_header header; struct proto_header header;
if (connection_get(connection, &header, sizeof header) == -1) { if (connection_get(connection, &header, sizeof header) == -1) {
@ -155,12 +141,17 @@ static void execute_events(struct backend_seatd *backend) {
switch (opcode) { switch (opcode) {
case SERVER_DISABLE_SEAT: case SERVER_DISABLE_SEAT:
handle_disable_seat(backend); log_info("Disabling seat");
backend->seat_listener->disable_seat(&backend->base,
backend->seat_listener_data);
break; break;
case SERVER_ENABLE_SEAT: case SERVER_ENABLE_SEAT:
handle_enable_seat(backend); log_info("Enabling seat");
backend->seat_listener->enable_seat(&backend->base,
backend->seat_listener_data);
break; break;
default: default:
log_errorf("Invalid opcode: %d", opcode);
abort(); abort();
} }
} }
@ -283,6 +274,8 @@ static void destroy(struct backend_seatd *backend) {
} }
static struct libseat *_open_seat(struct libseat_seat_listener *listener, void *data, int fd) { static struct libseat *_open_seat(struct libseat_seat_listener *listener, void *data, int fd) {
assert(listener != NULL);
assert(listener->enable_seat != NULL && listener->disable_seat != NULL);
struct backend_seatd *backend = calloc(1, sizeof(struct backend_seatd)); struct backend_seatd *backend = calloc(1, sizeof(struct backend_seatd));
if (backend == NULL) { if (backend == NULL) {
close(fd); close(fd);

2
libseat/libseat.c
View file

@ -32,7 +32,7 @@ static const struct named_backend impls[] = {
#endif #endif
struct libseat *libseat_open_seat(struct libseat_seat_listener *listener, void *data) { struct libseat *libseat_open_seat(struct libseat_seat_listener *listener, void *data) {
if (listener == NULL) { if (listener == NULL || listener->enable_seat == NULL || listener->disable_seat == NULL) {
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
} }