From 6dc0f86dbd53ffc064361ab07b6cee696f61f25f Mon Sep 17 00:00:00 2001 From: Ustun Ergenoglu Date: Wed, 14 Mar 2012 22:07:58 +0200 Subject: [PATCH] cairo-util: load_cairo_surface returns NULL if loading the file fails. Otherwise a non-existent file in the configuration crashes the desktop shell. Signed-off-by: Ustun Ergenoglu --- clients/cairo-util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/clients/cairo-util.c b/clients/cairo-util.c index 1f8d307..6d5794b 100644 --- a/clients/cairo-util.c +++ b/clients/cairo-util.c @@ -300,6 +300,10 @@ load_cairo_surface(const char *filename) void *data; image = load_image(filename); + if (image == NULL) { + return NULL; + } + data = pixman_image_get_data(image); width = pixman_image_get_width(image); height = pixman_image_get_height(image); -- 2.7.4