From 524bc91f375db66ae022c8d8f40f2215a8e3b02a Mon Sep 17 00:00:00 2001
From: Yuri Gorshenin <ygorshenin@chromium.org>
Date: Tue, 10 Mar 2015 19:36:00 +0300
Subject: [PATCH] [coding] Fixed PNG loading code.

---
 coding/lodepng_io_private.hpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/coding/lodepng_io_private.hpp b/coding/lodepng_io_private.hpp
index 72e2732aaf..d1fa8b3374 100644
--- a/coding/lodepng_io_private.hpp
+++ b/coding/lodepng_io_private.hpp
@@ -174,11 +174,22 @@ protected:
 
     void init()
     {
-      unsigned char buf[30];
-      m_reader.Read(0, buf, 30);
-//        io_error_if(fread(buf, 1, 30, get()) != 30,
-//                    "lodepng_check_validity: fail to read file");
-      m_decoder.inspect(buf, 30);
+      // 29 bytes are required to read: 8-bytes PNG magic, 4-bytes
+      // chunk length, 4-bytes chunk type, 4-bytes width, 4-bytes
+      // height, 1-byte bit depth, 1-byte color type, 1-byte
+      // compression type, 1-byte filter type and 1-byte interlace
+      // type.
+      //
+      // 4 more bytes are needed if CRC32 sum should be checked.
+      size_t const kMinSize = 29;
+      size_t const kMaxSize = kMinSize + 4;
+
+      unsigned char buf[kMaxSize];
+      size_t const size = m_decoder.settings.ignoreCrc ? kMinSize : kMaxSize;
+      m_reader.Read(0, buf, size);
+      // io_error_if(fread(buf, 1, 30, get()) != 30,
+      //             "lodepng_check_validity: fail to read file");
+      m_decoder.inspect(buf, size);
     }
 
 public: