From 94f39a493ffe24013d38c47ef7659218e0f91de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 10 Jan 2014 06:26:57 -0500 Subject: [PATCH] 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 --- src/compositor/meta-window-actor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index cf62d998f..a26d342bc 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -1714,7 +1714,8 @@ build_and_scan_frame_mask (MetaWindowActor *self, } meta_shaped_texture_set_mask_texture (stex, mask_texture); - cogl_object_unref (mask_texture); + if (mask_texture) + cogl_object_unref (mask_texture); g_free (mask_data); }