AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

setjmp for the png error handler. It seems setting the error handling

Browse Source 
2000-06-09  Larry Ewing  <lewing@helixcode.com>

	* gdk-pixbuf/io-png.c (gdk_pixbuf__png_image_load_increment):
	setjmp for the png error handler.  It seems setting the error
	handling functions does not avoid the jump, and so not calling
	setjmp was causing the incremental loader to jump into lala land.
	(gdk_pixbuf__png_image_begin_load): setjmp for error handling, I'm
	not sure this one is actually required but the docs say it must be
	set for every call to a png_* function.
	Also changed the comment to reflect the fact that setting the
	error handlers does _not_ avoid the longjmp.
This commit is contained in:
Larry Ewing 2000-06-09 19:41:29 +00:00 committed by Larry Ewing
parent 40298ef908
commit b166924b0c
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,15 @@
2000-06-09 Larry Ewing <lewing@helixcode.com>
* gdk-pixbuf/io-png.c (gdk_pixbuf__png_image_load_increment):
setjmp for the png error handler. It seems setting the error
handling functions does not avoid the jump, and so not calling
setjmp was causing the incremental loader to jump into lala land.
(gdk_pixbuf__png_image_begin_load): setjmp for error handling, I'm
not sure this one is actually required but the docs say it must be
set for every call to a png_* function.
Also changed the comment to reflect the fact that setting the
error handlers does _not_ avoid the longjmp.
2000-06-06 Larry Ewing <lewing@helixcode.com> 2000-06-06 Larry Ewing <lewing@helixcode.com>
* gdk-pixbuf/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done): * gdk-pixbuf/gdk-pixbuf-loader.c (gdk_pixbuf_loader_frame_done):

21
gdk-pixbuf/io-png.c
View File

@ -220,7 +220,8 @@ gdk_pixbuf__png_image_load (FILE *f)
free_buffer, NULL); free_buffer, NULL);
} }
/* These avoid the setjmp()/longjmp() crap in libpng */ /* I wish these avoided the setjmp()/longjmp() crap in libpng instead
just allow you to change the error reporting. */
static void png_error_callback (png_structp png_read_ptr, static void png_error_callback (png_structp png_read_ptr,
png_const_charp error_msg); png_const_charp error_msg);
@ -299,6 +300,7 @@ gdk_pixbuf__png_image_begin_load (ModulePreparedNotifyFunc prepare_func,
/* Create the main PNG context struct */ /* Create the main PNG context struct */
lc->png_read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, lc->png_read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
lc, /* error/warning callback data */ lc, /* error/warning callback data */
png_error_callback, png_error_callback,
@ -309,6 +311,13 @@ gdk_pixbuf__png_image_begin_load (ModulePreparedNotifyFunc prepare_func,
return NULL; return NULL;
} }
if (setjmp (lc->png_read_ptr->jmpbuf)) {
if (lc->png_info_ptr)
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
g_free(lc);
return NULL;
}
/* Create the auxiliary context struct */ /* Create the auxiliary context struct */
lc->png_info_ptr = png_create_info_struct(lc->png_read_ptr); lc->png_info_ptr = png_create_info_struct(lc->png_read_ptr);
@ -357,7 +366,11 @@ gdk_pixbuf__png_image_load_increment(gpointer context, guchar *buf, guint size)
lc->max_row_seen_in_chunk = -1; lc->max_row_seen_in_chunk = -1;
/* Invokes our callbacks as needed */ /* Invokes our callbacks as needed */
png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); if (setjmp (lc->png_read_ptr->jmpbuf)) {
return FALSE;
} else {
png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size);
}
if (lc->fatal_error_occurred) if (lc->fatal_error_occurred)
return FALSE; return FALSE;
@ -522,3 +535,7 @@ png_warning_callback(png_structp png_read_ptr,
fprintf(stderr, "Warning loading PNG: %s\n", warning_msg); fprintf(stderr, "Warning loading PNG: %s\n", warning_msg);
} }