commit c5db50f549a762123d7ad749a5f65a3832f67841
author Martin Olsson <martin@minimum.se> Sun Jul 08 03:03:43 2012 +0200
committer Kristian Høgsberg <krh@bitplanet.net> Mon Jul 09 17:50:45 2012 -0400
tree b4b81a7b42b3e7c6f00f8062dc2afc634aae0e32
parent c5da0999fe55af38a05cd6f01fc416fc65c47e8a

compositor-wayland: Add error handling in wayland_compositor_create()

src/compositor-wayland.c

diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index ea09730..9df7228 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -847,16 +847,16 @@
 
 	if (weston_compositor_init(&c->base, display, argc, argv,
 				   config_file) < 0)
-		return NULL;
+		goto err_free;
 
 	if (wayland_input_create(c) < 0)
-		return NULL;
+		goto err_compositor;
 
 	c->parent.wl_display = wl_display_connect(display_name);
 
 	if (c->parent.wl_display == NULL) {
 		weston_log("failed to create display: %m\n");
-		return NULL;
+		goto err_compositor;
 	}
 
 	wl_list_init(&c->input_list);
@@ -867,16 +867,16 @@
 
 	c->base.wl_display = display;
 	if (wayland_compositor_init_egl(c) < 0)
-		return NULL;
+		goto err_display;
 
 	c->base.destroy = wayland_destroy;
 
 	if (weston_compositor_init_gl(&c->base) < 0)
-		return NULL;
+		goto err_display;
 
 	create_border(c);
 	if (wayland_compositor_create_output(c, width, height) < 0)
-		return NULL;
+		goto err_display;
 
 	loop = wl_display_get_event_loop(c->base.wl_display);
 
@@ -885,9 +885,17 @@
 		wl_event_loop_add_fd(loop, fd, c->parent.event_mask,
 				     wayland_compositor_handle_event, c);
 	if (c->parent.wl_source == NULL)
-		return NULL;
+		goto err_display;
 
 	return &c->base;
+
+err_display:
+	wl_display_disconnect(c->parent.wl_display);
+err_compositor:
+	weston_compositor_shutdown(&c->base);
+err_free:
+	free(c);
+	return NULL;
 }
 
 WL_EXPORT struct weston_compositor *