From 6787e1cfcaaf01343b4785f967dd4864d35f7970 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Tue, 25 Aug 2009 11:58:30 +0200 Subject: [PATCH] =?UTF-8?q?Bug=C2=A0592901=20-=20Crash=20in=20JPEG=20pixbu?= =?UTF-8?q?f=20loader=20instead=20of=20error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Initialize the error structure early enough to ensure that it propagates properly in the case of an error. Patch by Nokia. --- gdk-pixbuf/io-jpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c index cf8c9ed195..680a209041 100644 --- a/gdk-pixbuf/io-jpeg.c +++ b/gdk-pixbuf/io-jpeg.c @@ -468,7 +468,6 @@ gdk_pixbuf__jpeg_image_load (FILE *f, GError **error) cinfo.err = jpeg_std_error (&jerr.pub); jerr.pub.error_exit = fatal_error_handler; jerr.pub.output_message = output_message_handler; - jerr.error = error; if (sigsetjmp (jerr.setjmp_buffer, 1)) { @@ -1190,11 +1189,11 @@ real_save_jpeg (GdkPixbuf *pixbuf, } /* set up error handling */ + cinfo.err = jpeg_std_error (&(jerr.pub)); jerr.pub.error_exit = fatal_error_handler; jerr.pub.output_message = output_message_handler; jerr.error = error; - cinfo.err = jpeg_std_error (&(jerr.pub)); if (sigsetjmp (jerr.setjmp_buffer, 1)) { jpeg_destroy_compress (&cinfo); g_free (buf);