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

client, server: handle wl_map_insert_new() failures

Browse source 
Signed-off-by: Aleksandr Mezin <mezin.alexander@gmail.com>
This commit is contained in:
Aleksandr Mezin 2022-02-09 06:26:18 +06:00 • committed by Simon Ser
parent 884d5fe3ab
commit 79c84ed3f1
2 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/wayland-client.c
View file

@ -430,6 +430,10 @@ proxy_create(struct wl_proxy *factory, const struct wl_interface *interface,
proxy->version = version;
proxy->object.id = wl_map_insert_new(&display->objects, 0, proxy);
if (proxy->object.id == 0) {
free(proxy);
return NULL;
}
return proxy;
}
@ -1158,11 +1162,16 @@ wl_display_connect_to_fd(int fd)
pthread_cond_init(&display->reader_cond, NULL);
display->reader_count = 0;
wl_map_insert_new(&display->objects, 0, NULL);
if (wl_map_insert_at(&display->objects, 0, 0, NULL) == -1)
goto err_connection;
display->proxy.object.interface = &wl_display_interface;
display->proxy.object.id =
wl_map_insert_new(&display->objects, 0, display);
if (display->proxy.object.id == 0)
goto err_connection;
display->proxy.object.interface = &wl_display_interface;
display->proxy.display = display;
display->proxy.object.implementation = (void(**)(void)) &display_listener;
display->proxy.user_data = display;

9
src/wayland-server.c
View file

@ -1826,8 +1826,13 @@ wl_resource_create(struct wl_client *client,
if (resource == NULL)
return NULL;
if (id == 0)
if (id == 0) {
id = wl_map_insert_new(&client->objects, 0, NULL);
if (id == 0) {
free(resource);
return NULL;
}
}
resource->object.id = id;
resource->object.interface = interface;
@ -2240,6 +2245,8 @@ wl_client_add_resource(struct wl_client *client,
resource->object.id =
wl_map_insert_new(&client->objects,
WL_MAP_ENTRY_LEGACY, resource);
if (resource->object.id == 0)
return 0;
} else if (wl_map_insert_at(&client->objects, WL_MAP_ENTRY_LEGACY,
resource->object.id, resource) < 0) {
if (errno == EINVAL) {