fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2025-12-20 04:40:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: Avoid derefencing a NULL xcb connection

Browse source
This commit is contained in:
Chris Wilson 2010-03-03 17:34:39 +00:00
parent 5bfea8447b
commit 70412bba0e
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
test/xcb-surface-source.c
View file

@ -90,6 +90,7 @@ static cairo_surface_t *
create_source_surface (int size)
{
#if CAIRO_HAS_XCB_SURFACE
xcb_connection_t *connection;
xcb_render_pictforminfo_t *render_format;
struct closure *data;
cairo_surface_t *surface;
@ -97,30 +98,34 @@ create_source_surface (int size)
xcb_void_cookie_t cookie;
void *formats;
data = xmalloc (sizeof (struct closure));
connection = xcb_connect (NULL, NULL);
if (connection == NULL)
return NULL;
data->connection = xcb_connect (NULL, NULL);
render_format = find_depth (data->connection, 32, &formats);
data = xmalloc (sizeof (struct closure));
data->connection = connection;
render_format = find_depth (connection, 32, &formats);
if (render_format == NULL) {
xcb_disconnect (data->connection);
xcb_disconnect (connection);
free (data);
return NULL;
}
root = xcb_setup_roots_iterator (xcb_get_setup (data->connection)).data;
root = xcb_setup_roots_iterator (xcb_get_setup (connection)).data;
data->pixmap = xcb_generate_id (data->connection);
cookie = xcb_create_pixmap_checked (data->connection, 32,
data->pixmap = xcb_generate_id (connection);
cookie = xcb_create_pixmap_checked (connection, 32,
data->pixmap, root->root, size, size);
/* slow, but sure */
if (xcb_request_check (data->connection, cookie) != NULL) {
if (xcb_request_check (connection, cookie) != NULL) {
free (formats);
xcb_disconnect (data->connection);
xcb_disconnect (connection);
free (data);
return NULL;
}
surface = cairo_xcb_surface_create_with_xrender_format (data->connection,
surface = cairo_xcb_surface_create_with_xrender_format (connection,
root,
data->pixmap,
render_format,