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

client: Sanitize shutdown/kill mechanism

Browse source
This commit is contained in:
Kenny Levinsen 2020-08-04 01:43:24 +02:00
parent a8204ebcea
commit db36f0dfe8
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
seatd/client.c
View file

@ -76,8 +76,6 @@ void client_kill(struct client *client) {
assert(client); assert(client);
if (client->connection.fd != -1) { if (client->connection.fd != -1) {
shutdown(client->connection.fd, SHUT_RDWR); shutdown(client->connection.fd, SHUT_RDWR);
close(client->connection.fd);
client->connection.fd = -1;
}; };
if (client->seat != NULL) { if (client->seat != NULL) {
seat_remove_client(client); seat_remove_client(client);
@ -96,7 +94,6 @@ void client_destroy(struct client *client) {
client->event_source = NULL; client->event_source = NULL;
} }
if (client->connection.fd != -1) { if (client->connection.fd != -1) {
shutdown(client->connection.fd, SHUT_RDWR);
close(client->connection.fd); close(client->connection.fd);
client->connection.fd = -1; client->connection.fd = -1;
} }

6
seatd/seat.c
View file

@ -40,7 +40,7 @@ void seat_destroy(struct seat *seat) {
while (!linked_list_empty(&seat->clients)) { while (!linked_list_empty(&seat->clients)) {
struct client *client = (struct client *)seat->clients.next; struct client *client = (struct client *)seat->clients.next;
// This will cause the client to remove itself from the seat // This will cause the client to remove itself from the seat
assert(client->seat); assert(client->seat == seat);
client_kill(client); client_kill(client);
} }
assert(seat->curttyfd == -1); assert(seat->curttyfd == -1);
@ -367,7 +367,7 @@ int seat_open_client(struct seat *seat, struct client *client) {
seat->active_client = client; seat->active_client = client;
if (client_send_enable_seat(client) == -1) { if (client_send_enable_seat(client) == -1) {
seat_remove_client(client); log_error("could not send enable signal");
return -1; return -1;
} }
@ -428,7 +428,7 @@ static int seat_disable_client(struct client *client) {
client->pending_disable = true; client->pending_disable = true;
if (client_send_disable_seat(seat->active_client) == -1) { if (client_send_disable_seat(seat->active_client) == -1) {
seat_remove_client(client); log_error("could not send disable event");
return -1; return -1;
} }