commit 06f1087a94f1e48298e89d77ccc51a0ced871958
author Matt Sarett <msarett@google.com> Mon Jan 04 12:56:20 2016 -0500
committer Matt Sarett <msarett@google.com> Mon Jan 04 12:56:20 2016 -0500
tree 18f93dee7cb5448005126d7846a6e06ba4070995
parent 9b1fe63dcc7ba076b9730b7bfa031cc0dbc25561

Update to 1.6.20

Contains fix for CVE-2015-8126.
(http://www.libpng.org/pub/png/libpng.html)

BUG:23265085
Change-Id: Ice2ec48b9ff7fa9746c8d0d24376a3c746c4361d

pngstruct.h

diff --git a/pngstruct.h b/pngstruct.h
index c8c0e46..d0bcc79 100644
--- a/pngstruct.h
+++ b/pngstruct.h
@@ -263,6 +263,9 @@
                               /* pixel depth used for the row buffers */
    png_byte transformed_pixel_depth;
                               /* pixel depth after read/write transforms */
+#if PNG_ZLIB_VERNUM >= 0x1240
+   png_byte zstream_start;    /* at start of an input zlib stream */
+#endif /* Zlib >= 1.2.4 */
 #if defined(PNG_READ_FILLER_SUPPORTED) || defined(PNG_WRITE_FILLER_SUPPORTED)
    png_uint_16 filler;           /* filler bytes for pixel expansion */
 #endif