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] Updated CHANGES and ANNOUNCE, removed trailing blanks from *.c *.h

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2015-11-24 14:38:52 -06:00
parent 616ed1197b
commit 5db709d83c
11 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ANNOUNCE
View File

@ -970,8 +970,9 @@ Version 1.7.0beta69 [November 24, 2015]
png_handle_pCAL() (Bug report by John Regehr). png_handle_pCAL() (Bug report by John Regehr).
Avoid conditionally compiling parts of statements in png.c (suggested Avoid conditionally compiling parts of statements in png.c (suggested
by flaviommedeiros). by flaviommedeiros).
Fixed bug recently introduced in png_set_PLTE() that uses png_ptr Fixed incorrect implementation of png_set_PLTE() that uses png_ptr
not info_ptr. not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126
vulnerability.
Added pngvalid --transform --interlace test. This increases code Added pngvalid --transform --interlace test. This increases code
coverage by generating test cases with smaller length rows as a coverage by generating test cases with smaller length rows as a
result of the interlacing. Without this packswap handling was result of the interlacing. Without this packswap handling was

5
CHANGES
View File

@ -5269,8 +5269,9 @@ Version 1.7.0beta69 [November 24, 2015]
png_handle_pCAL() (Bug report by John Regehr). png_handle_pCAL() (Bug report by John Regehr).
Avoid conditionally compiling parts of statements in png.c (suggested Avoid conditionally compiling parts of statements in png.c (suggested
by flaviommedeiros). by flaviommedeiros).
Fixed bug recently introduced in png_set_PLTE() that uses png_ptr Fixed incorrect implementation of png_set_PLTE() that uses png_ptr
not info_ptr. not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126
vulnerability.
Added pngvalid --transform --interlace test. This increases code Added pngvalid --transform --interlace test. This increases code
coverage by generating test cases with smaller length rows as a coverage by generating test cases with smaller length rows as a
result of the interlacing. Without this packswap handling was result of the interlacing. Without this packswap handling was

2
png.c
View File

@ -2288,7 +2288,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr,
* Fall through to "no match". * Fall through to "no match".
*/ */
png_chunk_report(png_ptr, png_chunk_report(png_ptr,
"Not recognizing known sRGB profile that has been edited", "Not recognizing known sRGB profile that has been edited",
PNG_CHUNK_WARNING); PNG_CHUNK_WARNING);
break; break;
# endif # endif

2
pngerror.c
View File

@ -788,7 +788,7 @@ png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN)
/* If control reaches this point, png_longjmp() must not return. The only /* If control reaches this point, png_longjmp() must not return. The only
* choice is to terminate the whole process (or maybe the thread); to do * choice is to terminate the whole process (or maybe the thread); to do
* this the ANSI-C abort() function is used unless a different method is * this the ANSI-C abort() function is used unless a different method is
* implemented by overriding the default configuration setting for * implemented by overriding the default configuration setting for
* PNG_ABORT (see scripts/pnglibconf.dfa). * PNG_ABORT (see scripts/pnglibconf.dfa).
* *

4
pngpread.c
View File

@ -411,7 +411,7 @@ png_push_read_process_IDAT(png_structp png_ptr, png_bytep *bufferp,
*/ */
{ {
png_alloc_size_t buffer_length; png_alloc_size_t buffer_length;
if (buffer_lengthp != NULL) if (buffer_lengthp != NULL)
buffer_length = *buffer_lengthp; buffer_length = *buffer_lengthp;
@ -620,7 +620,7 @@ png_push_read_process_IDAT(png_structp png_ptr, png_bytep *bufferp,
if (buffer_lengthp != NULL) if (buffer_lengthp != NULL)
{ {
png_push_read_sync_zstream(png_ptr, bufferp, buffer_lengthp); png_push_read_sync_zstream(png_ptr, bufferp, buffer_lengthp);
/* If the chunk_length is greater than 0 then there is extra data, /* If the chunk_length is greater than 0 then there is extra data,
* report this once. Notice that for IDAT after the end of the * report this once. Notice that for IDAT after the end of the
* stream we keep coming to this point and doing the skip. * stream we keep coming to this point and doing the skip.

12
pngrtran.c
View File

@ -593,7 +593,7 @@ png_do_read_unpack(png_transformp *transform, png_transform_controlp tc)
png_const_bytep sp = png_voidcast(png_const_bytep, tc->sp); png_const_bytep sp = png_voidcast(png_const_bytep, tc->sp);
png_const_bytep ep = png_voidcast(png_const_bytep, tc->dp); png_const_bytep ep = png_voidcast(png_const_bytep, tc->dp);
png_bytep dp = png_voidcast(png_bytep, tc->dp); png_bytep dp = png_voidcast(png_bytep, tc->dp);
sp += PNG_TC_ROWBYTES(*tc) - 1; /* Start from end */ sp += PNG_TC_ROWBYTES(*tc) - 1; /* Start from end */
dp += tc->width; /* output bit depth is 8 */ dp += tc->width; /* output bit depth is 8 */
@ -616,7 +616,7 @@ png_do_read_unpack(png_transformp *transform, png_transform_controlp tc)
if (shift == 0U) if (shift == 0U)
--sp; --sp;
} }
debug(shift == 0U); debug(shift == 0U);
break; break;
} }
@ -1826,7 +1826,7 @@ png_log16bit(unsigned int x)
* D^g * D^g
* P = ----- * P = -----
* D^g-1 * D^g-1
* *
* (M x (D^g-1)) (1) * (M x (D^g-1)) (1)
* R = (-----------)^(-) * R = (-----------)^(-)
* ( D^g ) (g) * ( D^g ) (g)
@ -2159,7 +2159,7 @@ png_gamma_nxmbit_correct(unsigned int value, png_fixed_point gamma_val,
r = floor(mout * pow(r, gamma_val*.00001)+.5); r = floor(mout * pow(r, gamma_val*.00001)+.5);
if (r < 1) if (r < 1)
return 0U; return 0U;
else if (r >= mout) else if (r >= mout)
return mout; return mout;
@ -3854,7 +3854,7 @@ png_init_rgb_to_gray(png_transformp *transform, png_transform_controlp tc)
{ {
png_transformp tr_expand = png_push_transform(png_ptr, png_transformp tr_expand = png_push_transform(png_ptr,
sizeof (png_expand), png_init_expand, transform, NULL); sizeof (png_expand), png_init_expand, transform, NULL);
debug(*transform == tr_expand); debug(*transform == tr_expand);
tr_expand->args |= PNG_EXPAND_tRNS; tr_expand->args |= PNG_EXPAND_tRNS;
png_init_expand(transform, tc); png_init_expand(transform, tc);
@ -3869,7 +3869,7 @@ png_init_rgb_to_gray(png_transformp *transform, png_transform_controlp tc)
{ {
png_fixed_point red, green; png_fixed_point red, green;
if (tr->coefficients_set) if (tr->coefficients_set)
{ {
red = tr->red_coefficient; red = tr->red_coefficient;

30
pngrutil.c
View File

@ -2472,7 +2472,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr)
/****************************************************************************** /******************************************************************************
* UNKNOWN HANDLING LOGIC * UNKNOWN HANDLING LOGIC
* *
* There are three ways an unknown chunk may arise: * There are three ways an unknown chunk may arise:
* *
* 1) Chunks not in the spec. * 1) Chunks not in the spec.
@ -2512,7 +2512,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr)
* *
* In the read code PNG_READ_UNKNOWN_CHUNKS_SUPPORTED is set only if either (1) * In the read code PNG_READ_UNKNOWN_CHUNKS_SUPPORTED is set only if either (1)
* or (2) or both are supported. * or (2) or both are supported.
* *
*****************************************************************************/ *****************************************************************************/
#ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED #ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
static int static int
@ -2742,10 +2742,10 @@ png_known_chunks[] =
* the hashed name. * the hashed name.
*/ */
static const png_byte png_chunk_lut[64] = static const png_byte png_chunk_lut[64] =
{ {
10, 20, 7, 3, 0, 23, 8, 0, 0, 11, 24, 0, 0, 0, 0, 4, 10, 20, 7, 3, 0, 23, 8, 0, 0, 11, 24, 0, 0, 0, 0, 4,
12, 0, 0, 0, 13, 0, 0, 0, 25, 0, 0, 0, 2, 0, 0, 0, 12, 0, 0, 0, 13, 0, 0, 0, 25, 0, 0, 0, 2, 0, 0, 0,
0, 6, 17, 0, 15, 0, 5, 19, 26, 0, 0, 0, 18, 0, 0, 9, 0, 6, 17, 0, 15, 0, 5, 19, 26, 0, 0, 0, 18, 0, 0, 9,
1, 0, 21, 0, 22, 14, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0 1, 0, 21, 0, 22, 14, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0
}; };
@ -2802,7 +2802,7 @@ png_cache_known_unknown(png_structrp png_ptr, png_const_bytep add, int keep)
(keep == PNG_HANDLE_CHUNK_IF_SAFE && (keep == PNG_HANDLE_CHUNK_IF_SAFE &&
PNG_CHUNK_ANCILLARY(name))) PNG_CHUNK_ANCILLARY(name)))
png_ptr->save_unknown |= 1U << i; png_ptr->save_unknown |= 1U << i;
else /* PNG_HANDLE_CHUNK_NEVER || !SAFE */ else /* PNG_HANDLE_CHUNK_NEVER || !SAFE */
png_ptr->save_unknown &= ~(1U << i); png_ptr->save_unknown &= ~(1U << i);
# endif /* SAVE_UNKNOWN_CHUNKS */ # endif /* SAVE_UNKNOWN_CHUNKS */
@ -2993,7 +2993,7 @@ png_find_chunk_op(png_structrp png_ptr)
# endif /* READ_USER_CHUNKS */ # endif /* READ_USER_CHUNKS */
# ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED # ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
/* There is no per-chunk special handling set for this chunk /* There is no per-chunk special handling set for this chunk
* (because of the test on known_unknown above) so only the * (because of the test on known_unknown above) so only the
* default unknown handling behavior matters. We skip the chunk * default unknown handling behavior matters. We skip the chunk
* if the behavior is 'NEVER' or 'DEFAULT'. This is irrelevant * if the behavior is 'NEVER' or 'DEFAULT'. This is irrelevant
@ -3155,7 +3155,7 @@ combine_row(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
* *
* The destination pointer (but not size) and how to handle intermediate * The destination pointer (but not size) and how to handle intermediate
* passes are arguments to the API. The destination is the pointer to the * passes are arguments to the API. The destination is the pointer to the
* entire row buffer, not just the part from output[x] on. 'display' is * entire row buffer, not just the part from output[x] on. 'display' is
* interpreted as: * interpreted as:
* *
* 0: only overwrite destination pixels that will correspond to the source * 0: only overwrite destination pixels that will correspond to the source
@ -3304,7 +3304,7 @@ combine_row(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
{ {
/* Fill a byte with copies of the next pixel: */ /* Fill a byte with copies of the next pixel: */
unsigned int spixel_rep = spixel; unsigned int spixel_rep = spixel;
# ifdef PNG_READ_PACKSWAP_SUPPORTED # ifdef PNG_READ_PACKSWAP_SUPPORTED
if (lsb) if (lsb)
spixel_rep >>= spos; spixel_rep >>= spos;
@ -3396,7 +3396,7 @@ combine_row(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
{ {
/* Fill a byte with copies of the next pixel: */ /* Fill a byte with copies of the next pixel: */
unsigned int spixel_rep = spixel; unsigned int spixel_rep = spixel;
# ifdef PNG_READ_PACKSWAP_SUPPORTED # ifdef PNG_READ_PACKSWAP_SUPPORTED
if (lsb) if (lsb)
spixel_rep >>= spos; spixel_rep >>= spos;
@ -3760,8 +3760,8 @@ png_inflate_IDAT(png_structrp png_ptr, int finish,
debug(png_ptr->zstream_ended); debug(png_ptr->zstream_ended);
if (!finish) /* early end */ if (!finish) /* early end */
break; break;
if (output_size > 0) /* incomplete read */ if (output_size > 0) /* incomplete read */
{ {
if (finish == 2) /* looking for end; it has been found */ if (finish == 2) /* looking for end; it has been found */
@ -4225,7 +4225,7 @@ png_read_process_IDAT(png_structrp png_ptr, png_bytep transformed_row,
PNG_ROWBYTES(pixel_depth, pixels); PNG_ROWBYTES(pixel_depth, pixels);
png_alloc_size_t cb; png_alloc_size_t cb;
affirm(bytes_to_read > bytes_read); affirm(bytes_to_read > bytes_read);
cb = png_inflate_IDAT(png_ptr, finish, cb = png_inflate_IDAT(png_ptr, finish,
pixel_buffer.buffer + bytes_read, pixel_buffer.buffer + bytes_read,
@ -4505,7 +4505,7 @@ png_read_finish_IDAT(png_structrp png_ptr)
*/ */
{ {
int ret = inflateEnd(&png_ptr->zstream); int ret = inflateEnd(&png_ptr->zstream);
/* In fact we expect this to always succeed, so it is a good idea to /* In fact we expect this to always succeed, so it is a good idea to
* catch it in pre-release builds: * catch it in pre-release builds:
*/ */

2
pngstruct.h
View File

@ -325,7 +325,7 @@ typedef void (*png_transform_fn)(/* Function to implement a transform */
* and format as before. * and format as before.
* *
* In the write case the transforms are called in the reverse order and * In the write case the transforms are called in the reverse order and
* the input bit depth and format should match the required values. * the input bit depth and format should match the required values.
* *
* It is valid during initialization for the transform function to push * It is valid during initialization for the transform function to push
* another transform into the list in either the read or the write case if * another transform into the list in either the read or the write case if

8
pngtrans.c
View File

@ -2228,7 +2228,7 @@ png_init_byte_ops(png_transformp *transform, png_transform_controlp tc)
{ {
unsigned int i = code_size; unsigned int i = code_size;
png_uint_32 code = 0U; png_uint_32 code = 0U;
while (i > 0U) while (i > 0U)
{ {
unsigned int next = codes[--i]; unsigned int next = codes[--i];
@ -2256,7 +2256,7 @@ png_init_byte_ops(png_transformp *transform, png_transform_controlp tc)
{ {
unsigned int i = 0U; unsigned int i = 0U;
png_uint_32 code = 0U; png_uint_32 code = 0U;
while (i < code_size) while (i < code_size)
{ {
unsigned int next = codes[i++]; unsigned int next = codes[i++];
@ -2295,7 +2295,7 @@ png_init_byte_ops(png_transformp *transform, png_transform_controlp tc)
#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED
static void static void
png_init_rgb_to_gray_byte_ops(png_transformp *transform, png_init_rgb_to_gray_byte_ops(png_transformp *transform,
png_transform_controlp tc) png_transform_controlp tc)
{ {
/* This just delay initializes the function; all the transform initialization /* This just delay initializes the function; all the transform initialization
@ -2532,7 +2532,7 @@ set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc, int alpha)
png_add_transform(png_ptr, sizeof (png_transform_byte_op), png_add_transform(png_ptr, sizeof (png_transform_byte_op),
png_init_byte_ops, PNG_TR_CHANNEL_POSTQ)); png_init_byte_ops, PNG_TR_CHANNEL_POSTQ));
png_uint_32 args = PNG_BO_FILLER; png_uint_32 args = PNG_BO_FILLER;
if (filler_loc == PNG_FILLER_BEFORE) if (filler_loc == PNG_FILLER_BEFORE)
args |= PNG_BO_FILLER_FIRST; args |= PNG_BO_FILLER_FIRST;

8
pngwrite.c
View File

@ -387,7 +387,7 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr)
return; return;
if ((png_ptr->mode & if ((png_ptr->mode &
(PNG_HAVE_IHDR+PNG_HAVE_IDAT+PNG_AFTER_IDAT+PNG_HAVE_IEND)) != (PNG_HAVE_IHDR+PNG_HAVE_IDAT+PNG_AFTER_IDAT+PNG_HAVE_IEND)) !=
(PNG_HAVE_IHDR+PNG_HAVE_IDAT+PNG_AFTER_IDAT)) (PNG_HAVE_IHDR+PNG_HAVE_IDAT+PNG_AFTER_IDAT))
{ {
/* Out of place png_write_end: */ /* Out of place png_write_end: */
@ -676,7 +676,7 @@ write_row_buffered(png_structrp png_ptr, png_const_bytep row,
{ {
png_transform_control tc; png_transform_control tc;
/* The initial values are the memory format, this was worked out in /* The initial values are the memory format, this was worked out in
* png_init_row_info below. * png_init_row_info below.
*/ */
memset(&tc, 0, sizeof tc); memset(&tc, 0, sizeof tc);
@ -981,7 +981,7 @@ interlace_row(png_structrp png_ptr, png_const_bytep row)
break; break;
default: /* Parameter is the pixel size in bytes */ default: /* Parameter is the pixel size in bytes */
write_row_buffered(png_ptr, row, write_row_buffered(png_ptr, row,
row_number == PNG_PASS_START_ROW(pass), last_pass_row, row_number == PNG_PASS_START_ROW(pass), last_pass_row,
end_of_image, interlace_row_byte, input_depth >> 3); end_of_image, interlace_row_byte, input_depth >> 3);
break; break;
@ -1038,7 +1038,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
* It's just a warning at present. * It's just a warning at present.
* *
* The test is that either the row_format produced by the write * The test is that either the row_format produced by the write
* transforms exactly matches that in the original * transforms exactly matches that in the original
* info_struct::format or that the info_struct::format was a simple * info_struct::format or that the info_struct::format was a simple
* mapping of the color_type that ended up in the IHDR: * mapping of the color_type that ended up in the IHDR:
*/ */

2
pngwutil.c
View File

@ -1971,7 +1971,7 @@ write_filtered_row(png_structrp png_ptr, png_const_bytep filtered_row,
if (filter < PNG_FILTER_VALUE_LAST) /* start of row */ if (filter < PNG_FILTER_VALUE_LAST) /* start of row */
{ {
png_byte buffer[1]; png_byte buffer[1];
buffer[0] = filter; buffer[0] = filter;
png_compress_IDAT(png_ptr, buffer, 1U/*len*/, Z_NO_FLUSH); png_compress_IDAT(png_ptr, buffer, 1U/*len*/, Z_NO_FLUSH);
} }