diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2014-01-10 06:26:57 -0500 |
|---|---|---|
| committer | Florian Müllner <fmuellner@gnome.org> | 2014-02-28 16:30:44 +0100 |
| commit | eb011636565808071603af92cf450e26fc17d0cf (patch) | |
| tree | 322b3c5b61eef3c6b9ce93c306144fdaab1c931f | |
| parent | 2bf844d58589392b38f7abd574c05eadef8a6d7d (diff) | |
| download | mutter-eb011636565808071603af92cf450e26fc17d0cf.tar.gz | |
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
| -rw-r--r-- | src/compositor/meta-window-actor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c index dcb1bd2a7..61a6e4eb7 100644 --- a/src/compositor/meta-window-actor.c +++ b/src/compositor/meta-window-actor.c @@ -1968,7 +1968,8 @@ build_and_scan_frame_mask (MetaWindowActor *self, meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), mask_texture); - cogl_object_unref (mask_texture); + if (mask_texture) + cogl_object_unref (mask_texture); g_free (mask_data); } |