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

GUAC-1389: PNG encoder should always release palette storage if an error occurs.

Browse Source
This commit is contained in:
Michael Jumper 2016-03-02 10:55:37 -08:00
parent 15f7fedfea
commit e42566816c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libguac/encode-png.c
View File

@ -318,6 +318,7 @@ int guac_png_write(guac_socket* socket, guac_stream* stream,
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);
guac_palette_free(palette);
guac_error = GUAC_STATUS_INTERNAL_ERROR; guac_error = GUAC_STATUS_INTERNAL_ERROR;
guac_error_message = "libpng failed to create info structure"; guac_error_message = "libpng failed to create info structure";
return -1; return -1;
@ -326,6 +327,7 @@ int guac_png_write(guac_socket* socket, guac_stream* stream,
/* 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);
guac_palette_free(palette);
guac_error = GUAC_STATUS_IO_ERROR; guac_error = GUAC_STATUS_IO_ERROR;
guac_error_message = "libpng output error"; guac_error_message = "libpng output error";
return -1; return -1;