commit 33a68eaaf49ab1baffe652dffdd36bcf3bcb775d
author Pekka Paalanen <ppaalanen@gmail.com> Thu Feb 14 12:18:00 2013 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Thu Feb 14 12:25:30 2013 -0500
tree c9728882432a4dd2946298e7b75aea36de6a06cd
parent 4e1065491bebef7213b8f496c6b8e1be526f1be0

window: check the initial wl_display_dispatch()

Check for errors in the first wl_display_dispatch() call. Otherwise
doing something silly like
  $ WAYLAND_SOCKET=999 ./clickdot
will segfault.

Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index 404c92f..79f9b0e 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -4287,7 +4287,12 @@
 
 	d->registry = wl_display_get_registry(d->display);
 	wl_registry_add_listener(d->registry, &registry_listener, d);
-	wl_display_dispatch(d->display);
+
+	if (wl_display_dispatch(d->display) < 0) {
+		fprintf(stderr, "Failed to process Wayland connection: %m\n");
+		return NULL;
+	}
+
 #ifdef HAVE_CAIRO_EGL
 	if (init_egl(d) < 0)
 		fprintf(stderr, "EGL does not seem to work, "