isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland/transaction: Handle NULL from->state in entry_merge_into

Browse Source 
This never happened so far, but it will with following commits.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3364>
This commit is contained in:
Michel Dänzer 2023-11-01 17:51:38 +01:00 committed by Marge Bot
parent 0807579cdd
commit 0bd40968ab
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wayland/meta-wayland-transaction.c
View File

@ -496,14 +496,18 @@ meta_wayland_transaction_entry_merge_into (MetaWaylandTransactionEntry *from,
to->has_sub_pos = TRUE; to->has_sub_pos = TRUE;
} }
if (to->state) if (from->state)
{ {
meta_wayland_surface_state_merge_into (from->state, to->state); if (to->state)
g_clear_object (&from->state); {
return; meta_wayland_surface_state_merge_into (from->state, to->state);
g_clear_object (&from->state);
}
else
{
to->state = g_steal_pointer (&from->state);
}
} }
to->state = g_steal_pointer (&from->state);
} }
void void