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

[libpng15] Revised test for validity of "num_unknowns" to eliminate compiler

Browse Source 
warnings.
This commit is contained in:
John Bowler 2013-01-17 13:09:32 -06:00 committed by Glenn Randers-Pehrson
parent 77a817bfc2
commit bec9ca9b8a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ANNOUNCE
View File

@ -81,7 +81,7 @@ Version 1.5.14rc01 [January 17, 2013]
No changes. No changes.
Version 1.5.14rc02 [January 17, 2013] Version 1.5.14rc02 [January 17, 2013]
Change info_ptr->unknown_chunks_num to type png_uint_32 Revised test for validity of "num_unknowns" to eliminate compiler warnings.
=========================================================================== ===========================================================================
NOTICE November 17, 2012: NOTICE November 17, 2012:

2
CHANGES
View File

@ -3974,7 +3974,7 @@ Version 1.5.14rc01 [January 17, 2013]
No changes. No changes.
Version 1.5.14rc02 [January 17, 2013] Version 1.5.14rc02 [January 17, 2013]
Change info_ptr->unknown_chunks_num to type png_uint_32 Revised test for validity of "num_unknowns" to eliminate compiler warnings.
=========================================================================== ===========================================================================
NOTICE November 17, 2012: NOTICE November 17, 2012:

2
pnginfo.h
View File

@ -228,7 +228,7 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
/* Storage for unknown chunks that the library doesn't recognize. */ /* Storage for unknown chunks that the library doesn't recognize. */
png_unknown_chunkp unknown_chunks; png_unknown_chunkp unknown_chunks;
png_uint_32 unknown_chunks_num; int unknown_chunks_num;
#endif #endif
#ifdef PNG_iCCP_SUPPORTED #ifdef PNG_iCCP_SUPPORTED

7
pngset.c
View File

@ -1040,9 +1040,10 @@ png_set_unknown_chunks(png_structp png_ptr,
return; return;
if (num_unknowns < 0 || if (num_unknowns < 0 ||
num_unknowns >= INT_MAX-info_ptr->unknown_chunks_num || num_unknowns > INT_MAX-info_ptr->unknown_chunks_num ||
num_unknowns >= PNG_SIZE_MAX/png_sizeof(png_unknown_chunk) (unsigned int)/*SAFE*/(num_unknowns +/*SAFE*/
- info_ptr->unknown_chunks_num) info_ptr->unknown_chunks_num) >=
PNG_SIZE_MAX/png_sizeof(png_unknown_chunk))
np=NULL; np=NULL;
else else