summaryrefslogtreecommitdiffstats
path: root/src/sp-image.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/sp-image.cpp')
-rw-r--r--src/sp-image.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index daf5e9e88..22b836703 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -328,6 +328,16 @@ static GdkPixbuf* pixbuf_new_from_file( const char *filename, time_t &modTime, g
);
if ( pngPtr )
{
+ if ( setjmp(png_jmpbuf(pngPtr)) )
+ {
+ // libpng calls longjmp to return here if an error occurs.
+ png_destroy_read_struct( &pngPtr, &infoPtr, NULL );
+ fclose(fp);
+ gdk_pixbuf_loader_close(loader, NULL);
+ g_object_unref(loader);
+ return NULL;
+ }
+
infoPtr = png_create_info_struct( pngPtr );
//endPtr = png_create_info_struct( pngPtr );