cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libpng16] Fix some comments

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2017-09-19 15:52:36 -05:00
parent 721b96ef90
commit 066cb34268
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
png.c
View File

@ -816,14 +816,14 @@ png_get_copyright(png_const_structrp png_ptr)
#else #else
# ifdef __STDC__ # ifdef __STDC__
return PNG_STRING_NEWLINE \ return PNG_STRING_NEWLINE \
"libpng version 1.6.33beta04 - September 17, 2017" PNG_STRING_NEWLINE \ "libpng version 1.6.33beta04 - September 19, 2017" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \ "Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson" \
PNG_STRING_NEWLINE \ PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE; PNG_STRING_NEWLINE;
# else # else
return "libpng version 1.6.33beta04 - September 17, 2017\ return "libpng version 1.6.33beta04 - September 19, 2017\
Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\ Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@ -1979,7 +1979,6 @@ icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace,
if (profile_length < 132) if (profile_length < 132)
return png_icc_profile_error(png_ptr, colorspace, name, profile_length, return png_icc_profile_error(png_ptr, colorspace, name, profile_length,
"too short"); "too short");
return 1; return 1;
} }
@ -2214,13 +2213,9 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
*/ */
for (itag=0; itag < tag_count; ++itag, tag += 12) for (itag=0; itag < tag_count; ++itag, tag += 12)
{ {
png_uint_32 tag_id = 0; png_uint_32 tag_id = png_get_uint_32(tag+0);
png_uint_32 tag_length = 0; png_uint_32 tag_start = png_get_uint_32(tag+4); /* must be aligned */
png_uint_32 tag_start = 0; png_uint_32 tag_length = png_get_uint_32(tag+8);/* not padded */
tag_id = png_get_uint_32(tag+0);
tag_length = png_get_uint_32(tag+8);/* not padded */
tag_start = png_get_uint_32(tag+4); /* must be aligned */
/* The ICC specification does not exclude zero length tags, therefore the /* The ICC specification does not exclude zero length tags, therefore the
* start might actually be anywhere if there is no data, but this would be * start might actually be anywhere if there is no data, but this would be
@ -2238,7 +2233,7 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace,
if ((tag_start & 3) != 0) if ((tag_start & 3) != 0)
{ {
/* CNHP730S.icc shipped with Microsoft Windows 64 violates this, it is /* CNHP730S.icc shipped with Microsoft Windows 64 violates this; it is
* only a warning here because libpng does not care about the * only a warning here because libpng does not care about the
* alignment. * alignment.
*/ */

2
pngrutil.c
View File

@ -671,7 +671,7 @@ png_decompress_chunk(png_structrp png_ptr,
png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr, png_bytep text = png_voidcast(png_bytep, png_malloc_base(png_ptr,
buffer_size)); buffer_size));
/* attempt to stop an oss-fuzz "use of uninitialized value" /* attempt to stop an oss-fuzz "use of uninitialized value"
* in png_set_text_2() * in png_set_text_2() and png_icc_check_tag_table()
*/ */
memset(text, 0, buffer_size); memset(text, 0, buffer_size);

4
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.6.33 [(PENDING RELEASE)] * Last changed in libpng 1.6.32 [August 24, 2017]
* Copyright (c) 1998-2017 Glenn Randers-Pehrson * Copyright (c) 1998-2017 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.)
@ -881,7 +881,6 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
} }
# endif # endif
/* oss-fuzz detects potential use of uninitialized value here */
if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0') if (text_ptr[i].text == NULL || text_ptr[i].text[0] == '\0')
{ {
text_length = 0; text_length = 0;
@ -893,6 +892,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr,
# endif # endif
textp->compression = PNG_TEXT_COMPRESSION_NONE; textp->compression = PNG_TEXT_COMPRESSION_NONE;
} }
else else
{ {
text_length = strlen(text_ptr[i].text); text_length = strlen(text_ptr[i].text);