[master] Free png_ptr->user_png_ver when destroying png_ptr.

This commit is contained in:
Glenn Randers-Pehrson 2009-11-02 06:04:47 -06:00
parent c75d7fb32e
commit 8e46375186
4 changed files with 12 additions and 0 deletions

View File

@ -107,6 +107,7 @@ version 1.2.41beta11 [November 2, 2009]
library mismatch. library mismatch.
version 1.2.41beta12 [November 2, 2009] version 1.2.41beta12 [November 2, 2009]
Free png_ptr->user_png_ver when destroying png_ptr.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net

View File

@ -2537,6 +2537,7 @@ version 1.2.41beta11 [November 2, 2009]
library mismatch. library mismatch.
version 1.2.41beta12 [November 2, 2009] version 1.2.41beta12 [November 2, 2009]
Free png_ptr->user_png_ver when destroying png_ptr.
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

View File

@ -1326,6 +1326,11 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr
#endif /* PNG_TEXT_SUPPORTED */ #endif /* PNG_TEXT_SUPPORTED */
#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ #endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
/* New member added in libpng-1.2.41, will be removed from 1.4.0 */
#ifdef PNG_iTXt_SUPPORTED
png_free(png_ptr, png_ptr->user_png_ver);
#endif
/* Save the important info out of the png_struct, in case it is /* Save the important info out of the png_struct, in case it is
* being used again. * being used again.
*/ */

View File

@ -1179,6 +1179,11 @@ png_write_destroy(png_structp png_ptr)
free_fn = png_ptr->free_fn; free_fn = png_ptr->free_fn;
#endif #endif
/* New member added in libpng-1.2.41, will be removed from 1.4.0 */
#ifdef PNG_iTXt_SUPPORTED
png_free(png_ptr, png_ptr->user_png_ver);
#endif
png_memset(png_ptr, 0, png_sizeof(png_struct)); png_memset(png_ptr, 0, png_sizeof(png_struct));
png_ptr->error_fn = error_fn; png_ptr->error_fn = error_fn;