callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialise the error handler exit routine to our own. Note this means that

Browse Source 
2000-05-30  Not Zed  <NotZed@HelixCode.com>

	* gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_begin_load):
	Initialise the error handler exit routine to our own.  Note this
	means that every function that accesses the jpeg lib on this
	object MUST do a setjmp.
	(gdk_pixbuf__jpeg_image_stop_load): setjmp before accessing jpeg
	lib for handling fatal error.
	(gdk_pixbuf__jpeg_image_load_increment): And here too.  So now
	your applications dont quit if there's a jpeg error!
This commit is contained in:
Not Zed 2000-05-31 02:07:07 +00:00 committed by Michael Zucci
parent 379da28de8
commit 85e7a89b13
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,14 @@
2000-05-30 Not Zed <NotZed@HelixCode.com>
* gdk-pixbuf/io-jpeg.c (gdk_pixbuf__jpeg_image_begin_load):
Initialise the error handler exit routine to our own. Note this
means that every function that accesses the jpeg lib on this
object MUST do a setjmp.
(gdk_pixbuf__jpeg_image_stop_load): setjmp before accessing jpeg
lib for handling fatal error.
(gdk_pixbuf__jpeg_image_load_increment): And here too. So now
your applications dont quit if there's a jpeg error!
2000-05-30 Federico Mena Quintero <federico@helixcode.com> 2000-05-30 Federico Mena Quintero <federico@helixcode.com>
* gdk-pixbuf.spec.in: Include all the loader libraries. Patch * gdk-pixbuf.spec.in: Include all the loader libraries. Patch

14
gdk-pixbuf/io-jpeg.c
View File

@ -108,7 +108,9 @@ fatal_error_handler (j_common_ptr cinfo)
errmgr = (struct error_handler_data *) cinfo->err; errmgr = (struct error_handler_data *) cinfo->err;
cinfo->err->output_message (cinfo); cinfo->err->output_message (cinfo);
siglongjmp (errmgr->setjmp_buffer, 1); siglongjmp (errmgr->setjmp_buffer, 1);
return;
/* incase the jmp buf isn't initted? */
exit(1);
} }
/* Destroy notification function for the pixbuf */ /* Destroy notification function for the pixbuf */
@ -300,6 +302,7 @@ gdk_pixbuf__jpeg_image_begin_load (ModulePreparedNotifyFunc prepared_func,
src = (my_src_ptr) context->cinfo.src; src = (my_src_ptr) context->cinfo.src;
context->cinfo.err = jpeg_std_error (&context->jerr.pub); context->cinfo.err = jpeg_std_error (&context->jerr.pub);
context->jerr.pub.error_exit = fatal_error_handler;
src = (my_src_ptr) context->cinfo.src; src = (my_src_ptr) context->cinfo.src;
src->pub.init_source = init_source; src->pub.init_source = init_source;
@ -328,8 +331,13 @@ gdk_pixbuf__jpeg_image_stop_load (gpointer data)
if (context->pixbuf) if (context->pixbuf)
gdk_pixbuf_unref (context->pixbuf); gdk_pixbuf_unref (context->pixbuf);
/* if we have an error? */
if (sigsetjmp (context->jerr.setjmp_buffer, 1)) {
jpeg_destroy_decompress (&context->cinfo);
} else {
jpeg_finish_decompress(&context->cinfo); jpeg_finish_decompress(&context->cinfo);
jpeg_destroy_decompress(&context->cinfo); jpeg_destroy_decompress(&context->cinfo);
}
if (context->cinfo.src) { if (context->cinfo.src) {
my_src_ptr src = (my_src_ptr) context->cinfo.src; my_src_ptr src = (my_src_ptr) context->cinfo.src;
@ -373,6 +381,10 @@ gdk_pixbuf__jpeg_image_load_increment (gpointer data, guchar *buf, guint size)
* have a grasp of what the flow needs to be! * have a grasp of what the flow needs to be!
*/ */
/* check for fatal error */
if (sigsetjmp (context->jerr.setjmp_buffer, 1)) {
return FALSE;
}
/* skip over data if requested, handle unsigned int sizes cleanly */ /* skip over data if requested, handle unsigned int sizes cleanly */
/* only can happen if we've already called jpeg_get_header once */ /* only can happen if we've already called jpeg_get_header once */