36c46c79ad
4.0.1
* Minor bug fixes, patch submitted by Damien Doligez
4.0.0
* Stop supporting the autoconf build. (It might works though.)
* Instead of autoconf, using omake and ocamlfind
* Subpackages: no need to link codes for uninterested format.
* Stop supporting lablgtk1
- Ximage2 module is now Ximage, and the older Ximage is removed
- OXimage2 module is now OXimage, and the older OXimage is removed
3.2.0
* Misnamed version. It should have been 3.0.3 or something.
* Small bug fix for image load memory allocation vulnerability
3.0.2
* O'Caml 3.11 port.
* Integer overflow vulnerability fix for pngread.c
3.0.1
* Alpha channel support for png images.
3.0.0
* new version numbering scheme
* autoconf and makefiles cleanup
* fix examples compilation
2.2.1
* Now compiling with -warn-error -A
42 lines
1.5 KiB
C
42 lines
1.5 KiB
C
$NetBSD: patch-src_pngread.c,v 1.1 2011/08/07 20:36:20 wiz Exp $
|
|
|
|
Fix build with png-1.5.
|
|
|
|
--- src/pngread.c.orig 2011-01-25 14:10:44.000000000 +0000
|
|
+++ src/pngread.c 2011-04-17 13:35:40.000000000 +0000
|
|
@@ -69,7 +69,7 @@
|
|
}
|
|
|
|
/* error handling */
|
|
- if (setjmp(png_ptr->jmpbuf)) {
|
|
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
|
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
|
fclose(fp);
|
|
@@ -134,7 +134,7 @@
|
|
png_set_rows(png_ptr, info_ptr, row_pointers);
|
|
|
|
/* Later, we can return something */
|
|
- if (setjmp(png_ptr->jmpbuf)) {
|
|
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
|
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
|
fclose(fp);
|
|
@@ -243,7 +243,7 @@
|
|
}
|
|
|
|
/* error handling */
|
|
- if (setjmp(png_ptr->jmpbuf)) {
|
|
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
|
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
|
fclose(fp);
|
|
@@ -302,7 +302,7 @@
|
|
png_set_rows(png_ptr, info_ptr, row_pointers);
|
|
|
|
/* Later, we can return something */
|
|
- if (setjmp(png_ptr->jmpbuf)) {
|
|
+ if (setjmp(png_jmpbuf(png_ptr))) {
|
|
/* Free all of the memory associated with the png_ptr and info_ptr */
|
|
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
|
|
fclose(fp);
|