Merge branch 'master' of https://github.com/lvandeve/lodepng

# By Lode (10) and others
# Via Lode
* 'master' of https://github.com/lvandeve/lodepng:
  fix for C
  fix examples
  better bitpointer checks
  small tweaks
  Update lodepng.h
  Update lodepng.cpp
  avoid too big pixel sizes
  predict idat size correctly for interlaced images
  unit test was a bit slow like that
  fix bug with encoding transparent single-pixel image
  protect against invalid chunk lengths in some tools
  fix pngdetail.cpp
  collapsing duplicate branch
  do not check unsigned windowsize for < 0

Conflicts:
	lodepng.cpp

1 files changed, 18 insertions, 2 deletions

diff --git a/example_png_info.cpp b/example_png_info.cpp
index 86f664a..afd845c 100644
--- a/example_png_info.cpp
+++ b/example_png_info.cpp
@@ -232,6 +232,10 @@ void displayFilterTypes(const std::vector<unsigned char>& buffer)
     {
       const unsigned char* cdata = lodepng_chunk_data_const(chunk);
       unsigned clength = lodepng_chunk_length(chunk);
+      if(chunk + clength + 12 > end) {
+        std::cout << "invalid chunk length" << std::endl;
+        return;
+      }
 
       for(unsigned i = 0; i < clength; i++)
       {
@@ -276,12 +280,18 @@ Main
 */
 int main(int argc, char *argv[]) /*list the chunks*/
 {
-  if(argc < 2)
+  bool ignore_checksums = false;
+  std::string filename = "";
+  for (int i = 1; i < argc; i++)
+  {
+    if(std::string(argv[i]) == "--ignore_checksums") ignore_checksums = true;
+    else filename = argv[i];
+  }
+  if(filename == "")
   {
     std::cout << "Please provide a filename to preview" << std::endl;
     return 0;
   }
-  const char* filename = argv[1];
 
   std::vector<unsigned char> buffer;
   std::vector<unsigned char> image;
@@ -290,6 +300,12 @@ int main(int argc, char *argv[]) /*list the chunks*/
   lodepng::load_file(buffer, filename); //load the image file with given filename
 
   lodepng::State state;
+  if(ignore_checksums)
+  {
+    state.decoder.ignore_crc = 1;
+    state.decoder.zlibsettings.ignore_adler32 = 1;
+  }
+
   unsigned error = lodepng::decode(image, w, h, state, buffer);
 
   if(error)