commit ffc7e57387b7d60db8ded98453fbd79887a7c331
author Leon Scroggins III <scroggo@google.com> Fri Oct 06 13:53:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 06 13:53:41 2017 +0000
tree 321eb6be0d944795c1b3903090691d1b30604066
parent a7857dd90c8fcf140768715f28d85a113701fc12
parent 99740b3bb9aae40c810005e1464d0428fa16bbf9

Fix truncated webp images DO NOT MERGE
am: 99740b3bb9

Change-Id: Ieeb5f8a69c42db29e3cd3abcffa575055647a958

src/codec/SkWebpCodec.cpp

diff --git a/src/codec/SkWebpCodec.cpp b/src/codec/SkWebpCodec.cpp
index 6cfb385..8acd205 100644
--- a/src/codec/SkWebpCodec.cpp
+++ b/src/codec/SkWebpCodec.cpp
@@ -235,7 +235,10 @@
     while (true) {
         const size_t bytesRead = stream()->read(buffer, BUFFER_SIZE);
         if (0 == bytesRead) {
-            WebPIDecGetRGB(idec, rowsDecoded, NULL, NULL, NULL);
+            if (!WebPIDecGetRGB(idec, rowsDecoded, NULL, NULL, NULL)
+                    || rowsDecoded && *rowsDecoded <= 0) {
+                return kInvalidInput;
+            }
             return kIncompleteInput;
         }