commit ff1c2d7914d34961a7577fd0538f78b30bfd81d3
author Dima Ryazanov <dima@gmail.com> Tue May 08 21:02:33 2012 -0700
committer Kristian Høgsberg <krh@bitplanet.net> Wed May 09 11:25:11 2012 -0400
tree e54c8db9811264a740ba9e5fc0ab8670fad6bee1
parent 87e4c9354e17037b7a3b7a21da10283c93d80f7d

window: Don't crash if a cursor image failed to load.

Signed-off-by: Dima Ryazanov <dima@gmail.com>

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index 2c59b23..72d36d3 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -687,10 +687,14 @@
 	display->cursor_shm_pool = shm_pool_create(display, pool_size);
 
 	for (i = 0; i < count; i++) {
-		if (!images[i])
-			continue;
-
 		cursor = &display->cursors[i];
+
+		if (!images[i]) {
+			cursor->n_images = 0;
+			cursor->images = NULL;
+			continue;
+		}
+
 		create_cursor_from_images(display, cursor, images[i]);
 
 		XcursorImagesDestroy(images[i]);
@@ -1958,6 +1962,9 @@
 	if (pointer == input->current_cursor)
 		return;
 
+	if (display->cursors[pointer].n_images == 0)
+		return;
+
 	image = &display->cursors[pointer].images[0];
 
 	if (!image->surface)