commit 358907eb39a40fc6b59289f0f092c09e70085db2
author Eric Vannier <evannier@google.com> Fri Jul 29 09:28:04 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 29 09:28:04 2011 -0700
tree 7a375165c96b754d82ba1b6c304084645a5197bf
parent 615c9ab066b4c05d109ffd4a1ce4f715edaf547a
parent 3c3a7e1f0fbff859b3aaff19069aee5d623a1f75

am 3c3a7e1f: (-s ours) am 791d8f2e: Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE

* commit '3c3a7e1f0fbff859b3aaff19069aee5d623a1f75':
  Upgrading libpng to 1.2.46 to fix a few vulnerabilities. DO NOT MERGE

pngread.c

diff --git a/pngread.c b/pngread.c
index fc4788b..b301d41 100644
--- a/pngread.c
+++ b/pngread.c
@@ -776,13 +776,18 @@
          png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
          break;
       }
-      if (ret != Z_OK)
+      if (ret != Z_OK) {
 #ifdef PNG_INDEX_SUPPORTED
-         if (png_ptr->index && png_ptr->row_number != png_ptr->height - 1)
+         if (png_ptr->index) {
+            if (png_ptr->row_number != png_ptr->height - 1) {
+               png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
+                     "Decompression error");
+            }
+         } else
 #endif
             png_error(png_ptr, png_ptr->zstream.msg ? png_ptr->zstream.msg :
-                   "Decompression error");
-
+                  "Decompression error");
+      }
    } while (png_ptr->zstream.avail_out);
 
    png_ptr->row_info.color_type = png_ptr->color_type;