Check the status of new Cairo surfaces properly

This commit is contained in:
Přemysl Eric Janouch 2021-09-18 13:52:08 +02:00
parent aae6fd4d8b
commit c8d408b428
Signed by: p
GPG Key ID: A0420B94F92B9493

View File

@ -229,8 +229,10 @@ open_wuffs(wuffs_base__image_decoder *dec,
cairo_surface_t *surface = cairo_surface_t *surface =
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
if (!surface) { cairo_status_t surface_status = cairo_surface_status(surface);
set_error(error, "failed to allocate an image surface"); if (surface_status != CAIRO_STATUS_SUCCESS) {
set_error(error, cairo_status_to_string(surface_status));
cairo_surface_destroy(surface);
free(workbuf.ptr); free(workbuf.ptr);
return NULL; return NULL;
} }
@ -336,8 +338,10 @@ open_libjpeg_turbo(const gchar *data, gsize len, GError **error)
cairo_surface_t *surface = cairo_surface_t *surface =
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
if (!surface) { cairo_status_t surface_status = cairo_surface_status(surface);
set_error(error, "failed to allocate an image surface"); if (surface_status != CAIRO_STATUS_SUCCESS) {
set_error(error, cairo_status_to_string(surface_status));
cairo_surface_destroy(surface);
tjDestroy(dec); tjDestroy(dec);
return NULL; return NULL;
} }
@ -444,8 +448,10 @@ open_libraw(const gchar *data, gsize len, GError **error)
int width = image->width, height = image->height; int width = image->width, height = image->height;
cairo_surface_t *surface = cairo_surface_t *surface =
cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
if (!surface) { cairo_status_t surface_status = cairo_surface_status(surface);
set_error(error, "failed to allocate an image surface"); if (surface_status != CAIRO_STATUS_SUCCESS) {
set_error(error, cairo_status_to_string(surface_status));
cairo_surface_destroy(surface);
libraw_dcraw_clear_mem(image); libraw_dcraw_clear_mem(image);
libraw_close(iprc); libraw_close(iprc);
return NULL; return NULL;