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

types/color_representation: correctly cleanup in manager create

Browse source 
Global should be created after all other initialization finished.
Free manager in err_options.
This commit is contained in:
Yixue Wang 2025-07-18 17:56:22 +08:00
parent a4eb2cff46
commit d2007d7dc1
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
types/wlr_color_representation_v1.c
View file

@ -366,14 +366,6 @@ struct wlr_color_representation_manager_v1 *wlr_color_representation_manager_v1_
return NULL;
}
manager->global = wl_global_create(display,
&wp_color_representation_manager_v1_interface,
version, manager, manager_bind);
if (manager->global == NULL) {
free(manager);
return NULL;
}
bool ok = true;
ok &= memdup(&manager->supported_alpha_modes,
options->supported_alpha_modes,
@ -385,6 +377,13 @@ struct wlr_color_representation_manager_v1 *wlr_color_representation_manager_v1_
goto err_options;
}
manager->global = wl_global_create(display,
&wp_color_representation_manager_v1_interface,
version, manager, manager_bind);
if (manager->global == NULL) {
goto err_options;
}
manager->display_destroy.notify = handle_display_destroy;
wl_display_add_destroy_listener(display, &manager->display_destroy);
@ -393,6 +392,7 @@ struct wlr_color_representation_manager_v1 *wlr_color_representation_manager_v1_
err_options:
free(manager->supported_alpha_modes);
free(manager->supported_coeffs_and_ranges);
free(manager);
return NULL;
}