mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-04 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wayland-server: Fix up error handling with client creation.

Browse source
This commit is contained in:
John Kåre Alsaker 2012-10-16 20:32:19 +02:00 • committed by Kristian Høgsberg
parent 009d452432
commit 0a6fabecd7
1 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/wayland-server.c
View file

@ -341,33 +341,41 @@ wl_client_create(struct wl_display *display, int fd)
WL_EVENT_READABLE, WL_EVENT_READABLE,
wl_client_connection_data, client); wl_client_connection_data, client);
if (!client->source)
goto err_client;
len = sizeof client->ucred; len = sizeof client->ucred;
if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED,
&client->ucred, &len) < 0) { &client->ucred, &len) < 0)
free(client); goto err_source;
return NULL;
}
client->connection = wl_connection_create(fd); client->connection = wl_connection_create(fd);
if (client->connection == NULL) { if (client->connection == NULL)
free(client); goto err_source;
return NULL;
}
wl_map_init(&client->objects); wl_map_init(&client->objects);
if (wl_map_insert_at(&client->objects, 0, NULL) < 0) { if (wl_map_insert_at(&client->objects, 0, NULL) < 0)
wl_map_release(&client->objects); goto err_map;
free(client);
return NULL;
}
wl_signal_init(&client->destroy_signal); wl_signal_init(&client->destroy_signal);
bind_display(client, display, 1, 1); bind_display(client, display, 1, 1);
if (!client->display_resource)
goto err_map;
wl_list_insert(display->client_list.prev, &client->link); wl_list_insert(display->client_list.prev, &client->link);
return client; return client;
err_map:
wl_map_release(&client->objects);
wl_connection_destroy(client->connection);
err_source:
wl_event_source_remove(client->source);
err_client:
free(client);
return NULL;
} }
WL_EXPORT void WL_EXPORT void
@ -1058,7 +1066,9 @@ bind_display(struct wl_client *client,
client->display_resource = client->display_resource =
wl_client_add_object(client, &wl_display_interface, wl_client_add_object(client, &wl_display_interface,
&display_interface, id, display); &display_interface, id, display);
client->display_resource->destroy = destroy_client_display_resource;
if(client->display_resource)
client->display_resource->destroy = destroy_client_display_resource;
} }
WL_EXPORT struct wl_display * WL_EXPORT struct wl_display *
@ -1230,7 +1240,8 @@ socket_data(int fd, uint32_t mask, void *data)
if (client_fd < 0) if (client_fd < 0)
wl_log("failed to accept: %m\n"); wl_log("failed to accept: %m\n");
else else
wl_client_create(display, client_fd); if (!wl_client_create(display, client_fd))
close(client_fd);
return 1; return 1;
} }