diff options
Diffstat (limited to 'gdk-pixbuf/io-jpeg.c')
| -rw-r--r-- | gdk-pixbuf/io-jpeg.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c index 6d9169f75..e399722ad 100644 --- a/gdk-pixbuf/io-jpeg.c +++ b/gdk-pixbuf/io-jpeg.c @@ -850,20 +850,23 @@ gdk_pixbuf__jpeg_image_stop_load (gpointer data, GError **error) cinfo = &context->cinfo; - /* Try to finish loading truncated files */ - if (context->pixbuf && - cinfo->output_scanline < cinfo->output_height) { - my_src_ptr src = (my_src_ptr) cinfo->src; - - /* But only if there's enough buffer space left */ - if (src->skip_next < sizeof(src->buffer) - 2) { - /* Insert a fake EOI marker */ - src->buffer[src->skip_next] = (JOCTET) 0xFF; - src->buffer[src->skip_next + 1] = (JOCTET) JPEG_EOI; - src->pub.next_input_byte = src->buffer + src->skip_next; - src->pub.bytes_in_buffer = 2; - - gdk_pixbuf__jpeg_image_load_lines (context, NULL); + context->jerr.error = error; + if (!sigsetjmp (context->jerr.setjmp_buffer, 1)) { + /* Try to finish loading truncated files */ + if (context->pixbuf && + cinfo->output_scanline < cinfo->output_height) { + my_src_ptr src = (my_src_ptr) cinfo->src; + + /* But only if there's enough buffer space left */ + if (src->skip_next < sizeof(src->buffer) - 2) { + /* Insert a fake EOI marker */ + src->buffer[src->skip_next] = (JOCTET) 0xFF; + src->buffer[src->skip_next + 1] = (JOCTET) JPEG_EOI; + src->pub.next_input_byte = src->buffer + src->skip_next; + src->pub.bytes_in_buffer = 2; + + gdk_pixbuf__jpeg_image_load_lines (context, NULL); + } } } |