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

[libpng17] Quieted warnings from clang-3.8 in pngunknown.c and pngvalid.c.

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2016-10-01 20:09:52 -05:00
parent 2127ecd0fa
commit e1c7c0402c
4 changed files with 34 additions and 19 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.7.0beta85 - September 26, 2016 Libpng 1.7.0beta85 - October 2, 2016
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.
@ -1408,8 +1408,9 @@ Version 1.7.0beta84 [September 26, 2016]
Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error(). Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().
Add tests/badcrc.png and tests/badadler.png to tests/pngtest. Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
Version 1.7.0beta85 [September 26, 2016] Version 1.7.0beta85 [October 2, 2016]
Updated the documentation about CRC and ADLER32 handling. Updated the documentation about CRC and ADLER32 handling.
Quieted warnings from clang-3.8 in pngunknown.c and pngvalid.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

3
CHANGES
View File

@ -5708,8 +5708,9 @@ Version 1.7.0beta84 [September 26, 2016]
Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error(). Issue png_benign_error() on ADLER32 checksum mismatch instead of png_error().
Add tests/badcrc.png and tests/badadler.png to tests/pngtest. Add tests/badcrc.png and tests/badadler.png to tests/pngtest.
Version 1.7.0beta85 [September 26, 2016] Version 1.7.0beta85 [October 2, 2016]
Updated the documentation about CRC and ADLER32 handling. Updated the documentation about CRC and ADLER32 handling.
Quieted warnings from clang-3.8 in pngunknown.c and pngvalid.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

4
contrib/libtests/pngunknown.c
View File

@ -1,7 +1,7 @@
/* pngunknown.c - test the read side unknown chunk handling /* pngunknown.c - test the read side unknown chunk handling
* *
* Last changed in libpng 1.6.22 [May 26, 2016] * Last changed in libpng 1.6.26 [(PENDING RELEASE)]
* Copyright (c) 2015,2016 Glenn Randers-Pehrson * Copyright (c) 2015,2016 Glenn Randers-Pehrson
* Written by John Cunningham Bowler * Written by John Cunningham Bowler
* *
@ -478,7 +478,7 @@ get_valid(display *d, png_infop info_ptr)
png_textp text; png_textp text;
png_uint_32 ntext = png_get_text(d->png_ptr, info_ptr, &text, NULL); png_uint_32 ntext = png_get_text(d->png_ptr, info_ptr, &text, NULL);
while (ntext-- > 0) switch (text[ntext].compression) while (ntext > 0) switch (text[--ntext].compression)
{ {
case -1: case -1:
flags |= PNG_INFO_tEXt; flags |= PNG_INFO_tEXt;

17
contrib/libtests/pngvalid.c
View File

@ -1,7 +1,7 @@
/* pngvalid.c - validate libpng by constructing then reading png files. /* pngvalid.c - validate libpng by constructing then reading png files.
* *
* Last changed in libpng 1.6.24 [(PENDING RELEASE)] * Last changed in libpng 1.6.26 [(PENDING RELEASE)]
* Copyright (c) 2014-2016 Glenn Randers-Pehrson * Copyright (c) 2014-2016 Glenn Randers-Pehrson
* Written by John Cunningham Bowler * Written by John Cunningham Bowler
* *
@ -1242,7 +1242,7 @@ store_image_check(const png_store* ps, png_const_structp pp, int iImage)
image += 2; /* skip image first row markers */ image += 2; /* skip image first row markers */
while (rows-- > 0) for (; rows > 0; --rows)
{ {
if (image[-2] != 190 || image[-1] != 239) if (image[-2] != 190 || image[-1] != 239)
png_error(pp, "row start overwritten"); png_error(pp, "row start overwritten");
@ -11427,7 +11427,16 @@ perform_interlace_macro_validation(void)
*/ */
for (v=0;;) for (v=0;;)
{ {
/* The first two tests overflow if the pass row or column is outside
* the possible range for a 32-bit result. In fact the values should
* never be outside the range for a 31-bit result, but checking for 32
* bits here ensures that if an app uses a bogus pass row or column
* (just so long as it fits in a 32 bit integer) it won't get a
* possibly dangerous overflow.
*/
/* First the base 0 stuff: */ /* First the base 0 stuff: */
if (v < png_pass_rows(0xFFFFFFFFU, pass))
{
m = PNG_ROW_FROM_PASS_ROW(v, pass); m = PNG_ROW_FROM_PASS_ROW(v, pass);
f = png_row_from_pass_row(v, pass); f = png_row_from_pass_row(v, pass);
if (m != f) if (m != f)
@ -11436,7 +11445,10 @@ perform_interlace_macro_validation(void)
v, pass, m, f); v, pass, m, f);
exit(99); exit(99);
} }
}
if (v < png_pass_cols(0xFFFFFFFFU, pass))
{
m = PNG_COL_FROM_PASS_COL(v, pass); m = PNG_COL_FROM_PASS_COL(v, pass);
f = png_col_from_pass_col(v, pass); f = png_col_from_pass_col(v, pass);
if (m != f) if (m != f)
@ -11445,6 +11457,7 @@ perform_interlace_macro_validation(void)
v, pass, m, f); v, pass, m, f);
exit(99); exit(99);
} }
}
m = PNG_ROW_IN_INTERLACE_PASS(v, pass); m = PNG_ROW_IN_INTERLACE_PASS(v, pass);
f = png_row_in_interlace_pass(v, pass); f = png_row_in_interlace_pass(v, pass);