maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add error handling to png.

Browse Source
This commit is contained in:
Michael Jumper 2012-04-19 21:05:07 -07:00
parent 844afb6478
commit 7bc4c199b6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libguac/src/protocol.c
View File

@ -157,6 +157,8 @@ int __guac_socket_write_length_png_cairo(guac_socket* socket, cairo_surface_t* s
png_data.data_size = 0; png_data.data_size = 0;
if (cairo_surface_write_to_png_stream(surface, __guac_socket_write_png_cairo, &png_data) != CAIRO_STATUS_SUCCESS) { if (cairo_surface_write_to_png_stream(surface, __guac_socket_write_png_cairo, &png_data) != CAIRO_STATUS_SUCCESS) {
guac_error = GUAC_STATUS_OUTPUT_ERROR;
guac_error_message = "Cairo PNG backend failed";
return -1; return -1;
} }
@ -258,19 +260,25 @@ int __guac_socket_write_length_png(guac_socket* socket, cairo_surface_t* surface
/* Set up PNG writer */ /* Set up PNG writer */
png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); png = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
if (!png) { if (!png) {
return -1; /* FIXME: Set guac_error, etc? */ guac_error = GUAC_STATUS_OUTPUT_ERROR;
guac_error_message = "libpng failed to create write structure";
return -1;
} }
png_info = png_create_info_struct(png); png_info = png_create_info_struct(png);
if (!png_info) { if (!png_info) {
png_destroy_write_struct(&png, NULL); png_destroy_write_struct(&png, NULL);
return -1; /* FIXME: Set guac_error, etc? */ guac_error = GUAC_STATUS_OUTPUT_ERROR;
guac_error_message = "libpng failed to create info structure";
return -1;
} }
/* Set error handler */ /* Set error handler */
if (setjmp(png_jmpbuf(png))) { if (setjmp(png_jmpbuf(png))) {
png_destroy_write_struct(&png, &png_info); png_destroy_write_struct(&png, &png_info);
return -1; /* FIXME: Set guac_error, etc? */ guac_error = GUAC_STATUS_OUTPUT_ERROR;
guac_error_message = "libpng output error";
return -1;
} }
/* Set up buffer structure */ /* Set up buffer structure */