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] Quieted three "comparison is always false due to limited range"

Browse Source 
compiler warnings in pngset.c
This commit is contained in:
Glenn Randers-Pehrson 2014-11-09 20:28:12 -06:00
parent 956a73a961
commit 2ccc2774f5
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.20beta01 - November 6, 2014 Libpng 1.5.20beta02 - November 10, 2014
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.
@ -9,21 +9,21 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a Source files with LF line endings (for Unix/Linux) and with a
"configure" script "configure" script
1.5.20beta01.tar.xz (LZMA-compressed, recommended) 1.5.20beta02.tar.xz (LZMA-compressed, recommended)
1.5.20beta01.tar.gz 1.5.20beta02.tar.gz
1.5.20beta01.tar.bz2 1.5.20beta02.tar.bz2
Source files with CRLF line endings (for Windows), without the Source files with CRLF line endings (for Windows), without the
"configure" script "configure" script
lp1520b01.7z (LZMA-compressed, recommended) lp1520b02.7z (LZMA-compressed, recommended)
lp1520b01.zip lp1520b02.zip
Other information: Other information:
1.5.20beta01-README.txt 1.5.20beta02-README.txt
1.5.20beta01-LICENSE.txt 1.5.20beta02-LICENSE.txt
libpng-1.5.20beta01-*.asc (armored detached GPG signatures) libpng-1.5.20beta02-*.asc (armored detached GPG signatures)
Changes since the last public release (1.5.19): Changes since the last public release (1.5.19):
@ -33,6 +33,10 @@ Version 1.5.20beta01 [November 6, 2014]
Avoid out-of-bounds memory access in png_user_version_check(). Avoid out-of-bounds memory access in png_user_version_check().
Simplified and future-proofed png_user_version_check(). Simplified and future-proofed png_user_version_check().
Version 1.5.20beta02 [November 10, 2014]
Quieted three "comparison is always false due to limited range" compiler
warnings in pngset.c
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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

4
CHANGES
View File

@ -4252,6 +4252,10 @@ Version 1.5.20beta01 [November 6, 2014]
Avoid out-of-bounds memory access in png_user_version_check(). Avoid out-of-bounds memory access in png_user_version_check().
Simplified and future-proofed png_user_version_check(). Simplified and future-proofed png_user_version_check().
Version 1.5.20beta02 [November 10, 2014]
Quieted three "comparison is always false due to limited range" compiler
warnings in pngset.c
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
https://lists.sourceforge.net/lists/listinfo/png-mng-implement https://lists.sourceforge.net/lists/listinfo/png-mng-implement

14
pngset.c
View File

@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct /* pngset.c - storage of image information into info struct
* *
* Last changed in libpng 1.5.19 [August 21, 2014] * Last changed in libpng 1.5.20 [(PENDING RELEASE)]
* Copyright (c) 1998-2014 Glenn Randers-Pehrson * Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -671,6 +671,7 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
png_const_textp text_ptr, int num_text) png_const_textp text_ptr, int num_text)
{ {
int i; int i;
size_t element_size;
png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" : png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" :
(unsigned long)png_ptr->chunk_name); (unsigned long)png_ptr->chunk_name);
@ -682,11 +683,12 @@ png_set_text_2(png_structp png_ptr, png_infop info_ptr,
* to hold all of the incoming text_ptr objects. * to hold all of the incoming text_ptr objects.
*/ */
element_size=png_sizeof(png_text);
if (num_text < 0 || if (num_text < 0 ||
num_text > INT_MAX - info_ptr->num_text - 8 || num_text > INT_MAX - info_ptr->num_text - 8 ||
(unsigned int)/*SAFE*/(num_text +/*SAFE*/ (unsigned int)/*SAFE*/(num_text +/*SAFE*/
info_ptr->num_text + 8) >= info_ptr->num_text + 8) >=
PNG_SIZE_MAX/png_sizeof(png_text)) PNG_SIZE_MAX/element_size)
{ {
png_warning(png_ptr, "too many text chunks"); png_warning(png_ptr, "too many text chunks");
return(0); return(0);
@ -967,15 +969,17 @@ png_set_sPLT(png_structp png_ptr,
{ {
png_sPLT_tp np; png_sPLT_tp np;
int i; int i;
size_t element_size;
if (png_ptr == NULL || info_ptr == NULL) if (png_ptr == NULL || info_ptr == NULL)
return; return;
element_size = PNG_SIZE_MAX/png_sizeof(png_sPLT_t);
if (nentries < 0 || if (nentries < 0 ||
nentries > INT_MAX-info_ptr->splt_palettes_num || nentries > INT_MAX-info_ptr->splt_palettes_num ||
(unsigned int)/*SAFE*/(nentries +/*SAFE*/ (unsigned int)/*SAFE*/(nentries +/*SAFE*/
info_ptr->splt_palettes_num) >= info_ptr->splt_palettes_num) >=
PNG_SIZE_MAX/png_sizeof(png_sPLT_t)) PNG_SIZE_MAX/element_size)
np=NULL; np=NULL;
else else
@ -1046,15 +1050,17 @@ png_set_unknown_chunks(png_structp png_ptr,
{ {
png_unknown_chunkp np; png_unknown_chunkp np;
int i; int i;
size_t element_size;
if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0) if (png_ptr == NULL || info_ptr == NULL || num_unknowns == 0)
return; return;
element_size = PNG_SIZE_MAX/png_sizeof(png_unknown_chunk);
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 ||
(unsigned int)/*SAFE*/(num_unknowns +/*SAFE*/ (unsigned int)/*SAFE*/(num_unknowns +/*SAFE*/
info_ptr->unknown_chunks_num) >= info_ptr->unknown_chunks_num) >=
PNG_SIZE_MAX/png_sizeof(png_unknown_chunk)) PNG_SIZE_MAX/element_size)
np=NULL; np=NULL;
else else