aboutsummaryrefslogtreecommitdiffstats
path: root/compositor/compositor.c
diff options
context:
space:
mode:
authorTim Wiederhake <twied@gmx.net>2011-01-27 01:32:36 +0100
committerKristian Høgsberg <krh@bitplanet.net>2011-01-26 20:36:06 -0500
commitac5c5e78533d093d9f790564bea114194a387c3a (patch)
tree44665080acf26b7ae1f25e99dc756f65789aa7ce /compositor/compositor.c
parentcompositor: Forward pointer focus notification from compostor backend (diff)
downloadwayland-ac5c5e78533d093d9f790564bea114194a387c3a.tar
wayland-ac5c5e78533d093d9f790564bea114194a387c3a.tar.gz
wayland-ac5c5e78533d093d9f790564bea114194a387c3a.tar.bz2
wayland-ac5c5e78533d093d9f790564bea114194a387c3a.tar.lz
wayland-ac5c5e78533d093d9f790564bea114194a387c3a.tar.xz
wayland-ac5c5e78533d093d9f790564bea114194a387c3a.tar.zst
wayland-ac5c5e78533d093d9f790564bea114194a387c3a.zip
Don't create buffer from NULL pointer
Fixes regression introduced in f58d8ca1bd20180bfae3a3a047e8098e0b22b5aa.
Diffstat (limited to 'compositor/compositor.c')
-rw-r--r--compositor/compositor.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/compositor/compositor.c b/compositor/compositor.c
index 324e73d..ed7656b 100644
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@@ -264,6 +264,8 @@ create_buffer_from_png(struct wlsc_compositor *ec,
struct wl_buffer *buffer;
pixels = wlsc_load_image(filename, width, height);
+ if(pixels == NULL)
+ return NULL;
buffer = ec->create_buffer(ec, width, height,
&ec->compositor.premultiplied_argb_visual,