From bc8e40d6114533de0dd95bd793268df58a1a2e94 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 15 Jul 2013 08:44:53 -0500
Subject: [PATCH] [libpng16] Added "/* SAFE */" comments in pngrutil.c and
 pngrtran.c

where warnings may be erroneously issued by code-checking applications.
Revised manual about changes in iTXt chunk handling made in libpng-1.6.0.
---
 ANNOUNCE   | 19 ++++++++++++-------
 CHANGES    |  9 ++++++++-
 pngpread.c |  2 +-
 pngrutil.c |  2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 6f9281a6f..3af2aa253 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.6.3rc01 - July 11, 2013
+Libpng 1.6.3rc02 - July 15, 2013
 
 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.
@@ -9,19 +9,19 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a
 "configure" script
 
-   1.6.3rc01.tar.xz (LZMA-compressed, recommended)
-   1.6.3rc01.tar.gz
+   1.6.3rc02.tar.xz (LZMA-compressed, recommended)
+   1.6.3rc02.tar.gz
 
 Source files with CRLF line endings (for Windows), without the
 "configure" script
 
-   lp163r01.7z  (LZMA-compressed, recommended)
-   lp163r01.zip
+   lp163r02.7z  (LZMA-compressed, recommended)
+   lp163r02.zip
 
 Other information:
 
-   1.6.3rc01-README.txt
-   1.6.3rc01-LICENSE.txt
+   1.6.3rc02-README.txt
+   1.6.3rc02-LICENSE.txt
 
 Changes since the last public release (1.6.2):
 
@@ -127,6 +127,11 @@ Version 1.6.3beta10 [July 5, 2013]
 Version 1.6.3rc01 [July 11, 2013]
   No changes.
 
+Version 1.6.3rc02 [July 15, 2013]
+  Revised manual about changes in iTXt chunk handling made in libpng-1.6.0.
+  Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings
+    may be erroneously issued by code-checking applications.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 9c5813d3f..5c9bbf43b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4047,7 +4047,9 @@ Version 1.6.0beta17 [March 10, 2012]
   Deflate/inflate was reworked to move common zlib calls into single
     functions [rw]util.c.  A new shared keyword check routine was also added
     and the 'zbuf' is no longer allocated on progressive read.  It is now
-    possible to call png_inflate() incrementally.
+    possible to call png_inflate() incrementally.  A warning is no longer
+    issued if the language tag or translated keyword in the iTXt chunk
+    has zero length.
   If benign errors are disabled use maximum window on ancilliary inflate.
     This works round a bug introduced in 1.5.4 where compressed ancillary
     chunks could end up with a too-small windowBits value in the deflate
@@ -4611,6 +4613,11 @@ Version 1.6.3beta10 [July 5, 2013]
 Version 1.6.3rc01 [July 11, 2013]
   No changes.
 
+Version 1.6.3rc02 [July 15, 2013]
+  Revised manual about changes in iTXt chunk handling made in libpng-1.6.0.
+  Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings
+    may be erroneously issued by code-checking applications.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/pngpread.c b/pngpread.c
index f132ce600..0169ecb2c 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -151,7 +151,7 @@ png_process_some_data(png_structrp png_ptr, png_inforp info_ptr)
 void /* PRIVATE */
 png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr)
 {
-   png_size_t num_checked = png_ptr->sig_bytes,
+   png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */ 
              num_to_check = 8 - num_checked;
 
    if (png_ptr->buffer_size < num_to_check)
diff --git a/pngrutil.c b/pngrutil.c
index b6bc4a73d..8c7f837a9 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -3694,7 +3694,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass,
 
             for (i = 0; i < row_info->width; i++)
             {
-               png_byte v[8];
+               png_byte v[8]; /* SAFE; pixel_bytes does not exceed 64 */
                int j;
 
                memcpy(v, sp, pixel_bytes);