Skip to content

wl: guard wl_output_release with a version check #796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daviesjamesdaniel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wl: guard wl_output_release with a version check #796

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion platform/wayland/cog-platform-wl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,15 @@ registry_on_global_remove(void *data, struct wl_registry *registry, uint32_t nam
wl_list_for_each_safe(output, tmp_output, &platform->display->outputs, link) {
if (output->name == name) {
g_debug("%s: output #%" PRIi32 " @ %p removed.", G_STRFUNC, output->name, output->output);
g_clear_pointer(&output->output, wl_output_release);
if (output->output) {
if (wl_proxy_get_version((struct wl_proxy *) output->output) >= WL_OUTPUT_RELEASE_SINCE_VERSION) {
wl_output_release(output->output);
} else {
wl_proxy_destroy((struct wl_proxy *) output->output);
}
output->output = NULL;
}

wl_list_remove(&output->link);
if (platform->display->current_output == output) {
platform->display->current_output =
Expand Down