diff options
Diffstat (limited to 'source/rofi-icon-fetcher.c')
| -rw-r--r-- | source/rofi-icon-fetcher.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/source/rofi-icon-fetcher.c b/source/rofi-icon-fetcher.c index 09f9d8e6..60ede6f3 100644 --- a/source/rofi-icon-fetcher.c +++ b/source/rofi-icon-fetcher.c @@ -42,6 +42,8 @@ #include <stdint.h> #include <jpeglib.h> +#include <setjmp.h> + typedef struct { // Context for icon-themes. @@ -171,11 +173,29 @@ static cairo_surface_t* cairo_image_surface_create_from_jpeg_private ( struct jp return surface; } +struct jpegErrorManager { + /* "public" fields */ + struct jpeg_error_mgr pub; + /* for return to caller */ + jmp_buf setjmp_buffer; +}; +char jpegLastErrorMsg[JMSG_LENGTH_MAX]; +static void jpegErrorExit (j_common_ptr cinfo) +{ + /* cinfo->err actually points to a jpegErrorManager struct */ + struct jpegErrorManager* myerr = (struct jpegErrorManager*) cinfo->err; + + /* Create the message */ + ( *(cinfo->err->format_message) ) (cinfo, jpegLastErrorMsg); + g_warning ( jpegLastErrorMsg ); + + /* Jump to the setjmp point */ + longjmp(myerr->setjmp_buffer, 1); +} static cairo_surface_t* cairo_image_surface_create_from_jpeg ( const char* file ) { struct jpeg_decompress_struct cinfo; - struct jpeg_error_mgr jerr; cairo_surface_t * surface; FILE * infile; @@ -183,7 +203,16 @@ static cairo_surface_t* cairo_image_surface_create_from_jpeg ( const char* file return NULL; } - cinfo.err = jpeg_std_error ( &jerr ); + struct jpegErrorManager jerr; + cinfo.err = jpeg_std_error( &jerr.pub); + jerr.pub.error_exit = jpegErrorExit; + /* Establish the setjmp return context for my_error_exit to use. */ + if (setjmp(jerr.setjmp_buffer)) { + /* If we get here, the JPEG code has signaled an error. */ + jpeg_destroy_decompress(&cinfo); + fclose(infile); + return NULL; + } jpeg_create_decompress ( &cinfo ); jpeg_stdio_src ( &cinfo, infile ); |