[libpng14] Avoid a possible memory leak in contrib/gregbook/readpng.c

This commit is contained in:
Glenn Randers-Pehrson 2013-03-01 13:24:13 -06:00
parent 66c15e8126
commit 20cddc2d8e
3 changed files with 9 additions and 3 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.13beta03 - January 22, 2013 Libpng 1.4.13beta03 - March 1, 2013
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.
@ -42,7 +42,8 @@ version 1.4.13beta02 [January 22, 2013]
in configure.ac in configure.ac
Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h. Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h.
version 1.4.13beta03 [January 22, 2013] version 1.4.13beta03 [March 1, 2013]
Avoid a possible memory leak in contrib/gregbook/readpng.c
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit

View File

@ -2884,7 +2884,8 @@ version 1.4.13beta02 [January 22, 2013]
in configure.ac in configure.ac
Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h. Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h.
version 1.4.13beta03 [January 22, 2013] version 1.4.13beta03 [March 1, 2013]
Avoid a possible memory leak in contrib/gregbook/readpng.c
Send comments/corrections/commendations to glennrp at users.sourceforge.net Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit or to png-mng-implement at lists.sf.net (subscription required; visit

View File

@ -214,6 +214,10 @@ uch *readpng_get_image(double display_exponent, int *pChannels, ulg *pRowbytes)
* libpng function */ * libpng function */
if (setjmp(png_jmpbuf(png_ptr))) { if (setjmp(png_jmpbuf(png_ptr))) {
free(image_data);
image_data = NULL;
free(row_pointers);
row_pointers = NULL;
png_destroy_read_struct(&png_ptr, &info_ptr, NULL); png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
return NULL; return NULL;
} }