window-actor: Guard against %NULL frame mask

Creating a new cogl texture may fail, in which case the intent to
free it will crash. While something is clearly wrong (insanely
large window, oom, ...), crashing the WM is harsh and we should
try to avoid it if at all possible, so carry on.

https://bugzilla.gnome.org/show_bug.cgi?id=722266
This commit is contained in:
Florian Müllner 2014-01-10 06:26:57 -05:00
parent 2bf844d585
commit eb01163656

View File

@ -1968,7 +1968,8 @@ build_and_scan_frame_mask (MetaWindowActor *self,
meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor),
mask_texture); mask_texture);
cogl_object_unref (mask_texture); if (mask_texture)
cogl_object_unref (mask_texture);
g_free (mask_data); g_free (mask_data);
} }