test: Improve memfault behaviour.

Various minor tweaks to convert asserts into error returns and to
improve error checking on intermediate surfaces.

1 files changed, 6 insertions, 1 deletions

diff --git a/test/xlib-surface-source.c b/test/xlib-surface-source.c
index 65a9fdfe..7d2ed71c 100644
--- a/test/xlib-surface-source.c
+++ b/test/xlib-surface-source.c
@@ -79,7 +79,12 @@ create_source_surface (int size)
 							     xrender_format,
 							     size, size);
     data->device = cairo_device_reference (cairo_surface_get_device (surface));
-    cairo_surface_set_user_data (surface, &closure_key, data, cleanup);
+    if (cairo_surface_set_user_data (surface, &closure_key, data, cleanup)) {
+	cairo_surface_finish (surface);
+	cairo_surface_destroy (surface);
+	cleanup (data);
+	return NULL;
+    }
 
     return surface;
 #else