mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Fixed error checking in the simplified write API (Olaf van der Spek)

Browse Source
This commit is contained in:
John Bowler 2012-11-15 00:06:30 -06:00 committed by Glenn Randers-Pehrson
parent 9d1ddbb78f
commit 70850fce0c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.6.0beta32 - November 14, 2012 Libpng 1.6.0beta32 - November 15, 2012
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -545,10 +545,11 @@ Version 1.6.0beta31 [November 1, 2012]
gain; implementing full ICC color correction may be desireable but is left gain; implementing full ICC color correction may be desireable but is left
up to applications. up to applications.
Version 1.6.0beta32 [November 14, 2012] Version 1.6.0beta32 [November 15, 2012]
Fixed an intermittent SEGV in pngstest due to an uninitialized array element. Fixed an intermittent SEGV in pngstest due to an uninitialized array element.
Added the ability for contrib/libtests/makepng.c to make a PNG with just one Added the ability for contrib/libtests/makepng.c to make a PNG with just one
color. This is useful for debugging pngstest color inaccuracy reports. color. This is useful for debugging pngstest color inaccuracy reports.
Fixed error checking in the simplified write API (Olaf van der Spek)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

3
CHANGES
View File

@ -4297,10 +4297,11 @@ Version 1.6.0beta31 [November 1, 2012]
gain; implementing full ICC color correction may be desireable but is left gain; implementing full ICC color correction may be desireable but is left
up to applications. up to applications.
Version 1.6.0beta32 [November 14, 2012] Version 1.6.0beta32 [November 15, 2012]
Fixed an intermittent SEGV in pngstest due to an uninitialized array element. Fixed an intermittent SEGV in pngstest due to an uninitialized array element.
Added the ability for contrib/libtests/makepng.c to make a PNG with just one Added the ability for contrib/libtests/makepng.c to make a PNG with just one
color. This is useful for debugging pngstest color inaccuracy reports. color. This is useful for debugging pngstest color inaccuracy reports.
Fixed error checking in the simplified write API (Olaf van der Spek)
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

6
pngwrite.c
View File

@ -1595,7 +1595,7 @@ png_image_write_init(png_imagep image)
png_destroy_write_struct(&png_ptr, NULL); png_destroy_write_struct(&png_ptr, NULL);
} }
return png_image_error(image, "png_image_read: out of memory"); return png_image_error(image, "png_image_write_: out of memory");
} }
/* Arguments to png_image_write_main: */ /* Arguments to png_image_write_main: */
@ -2212,7 +2212,7 @@ png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit,
const void *buffer, png_int_32 row_stride, const void *colormap) const void *buffer, png_int_32 row_stride, const void *colormap)
{ {
/* Write the image to the given (FILE*). */ /* Write the image to the given (FILE*). */
if (image != NULL || image->version != PNG_IMAGE_VERSION) if (image != NULL && image->version == PNG_IMAGE_VERSION)
{ {
if (file != NULL) if (file != NULL)
{ {
@ -2262,7 +2262,7 @@ png_image_write_to_file(png_imagep image, const char *file_name,
const void *colormap) const void *colormap)
{ {
/* Write the image to the named file. */ /* Write the image to the named file. */
if (image != NULL || image->version != PNG_IMAGE_VERSION) if (image != NULL && image->version == PNG_IMAGE_VERSION)
{ {
if (file_name != NULL) if (file_name != NULL)
{ {