mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-03 09:01:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

window: add null checks

Browse source 
Also check for invalid parameters early on, so if we crash,
we know *why* we crashed.
This commit is contained in:
nobled 2011-02-01 18:51:47 +00:00
parent 14d222f612
commit 7b87cb04a9
1 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
clients/window.c
View file

@ -245,6 +245,11 @@ display_create_drm_surface(struct display *display,
image_attribs[3] = rectangle->height; image_attribs[3] = rectangle->height;
data->image = eglCreateDRMImageMESA(dpy, image_attribs); data->image = eglCreateDRMImageMESA(dpy, image_attribs);
if (data->image == EGL_NO_IMAGE_KHR) {
free(data);
return NULL;
}
cairo_device_acquire(display->device); cairo_device_acquire(display->device);
glGenTextures(1, &data->texture); glGenTextures(1, &data->texture);
glBindTexture(GL_TEXTURE_2D, data->texture); glBindTexture(GL_TEXTURE_2D, data->texture);
@ -313,6 +318,11 @@ display_create_drm_surface_from_file(struct display *display,
} }
surface = display_create_drm_surface(display, rect); surface = display_create_drm_surface(display, rect);
if (surface == NULL) {
g_object_unref(pixbuf);
return NULL;
}
data = cairo_surface_get_user_data(surface, &surface_data_key); data = cairo_surface_get_user_data(surface, &surface_data_key);
cairo_device_acquire(display->device); cairo_device_acquire(display->device);
@ -442,6 +452,11 @@ display_create_shm_surface_from_file(struct display *display,
pixels = gdk_pixbuf_get_pixels(pixbuf); pixels = gdk_pixbuf_get_pixels(pixbuf);
surface = display_create_shm_surface(display, rect); surface = display_create_shm_surface(display, rect);
if (surface == NULL) {
g_object_unref(pixbuf);
return NULL;
}
dest_data = cairo_image_surface_get_data (surface); dest_data = cairo_image_surface_get_data (surface);
dest_stride = cairo_image_surface_get_stride (surface); dest_stride = cairo_image_surface_get_stride (surface);
@ -467,10 +482,23 @@ display_create_shm_surface_from_file(struct display *display,
return surface; return surface;
} }
static int
check_size(struct rectangle *rect)
{
if (rect->width && rect->height)
return 0;
fprintf(stderr, "tried to create surface of "
"width: %d, height: %d\n", rect->width, rect->height);
return -1;
}
cairo_surface_t * cairo_surface_t *
display_create_surface(struct display *display, display_create_surface(struct display *display,
struct rectangle *rectangle) struct rectangle *rectangle)
{ {
if (check_size(rectangle) < 0)
return NULL;
#ifdef HAVE_CAIRO_EGL #ifdef HAVE_CAIRO_EGL
if (display->drm) { if (display->drm) {
return display_create_drm_surface(display, rectangle); return display_create_drm_surface(display, rectangle);
@ -484,6 +512,8 @@ display_create_surface_from_file(struct display *display,
const char *filename, const char *filename,
struct rectangle *rectangle) struct rectangle *rectangle)
{ {
if (check_size(rectangle) < 0)
return NULL;
#ifdef HAVE_CAIRO_EGL #ifdef HAVE_CAIRO_EGL
if (display->drm) { if (display->drm) {
return display_create_drm_surface_from_file(display, filename, rectangle); return display_create_drm_surface_from_file(display, filename, rectangle);