commit 7d6c1b72f965dd35d962137bd51c555d5b24ce6a
author Leon Scroggins III <scroggo@google.com> Fri Oct 06 14:11:49 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 06 14:11:49 2017 +0000
tree 64e00cbca9192e9258c119b41fa39bbb6f713460
parent 99ee7256eb83e3bfa958ab8225ea2b130949d45d
parent 088c6aa7733f27d0e609aec9e6e121920d1d9142

Fix truncated webp images DO NOT MERGE am: 99740b3bb9 am: ffc7e57387
am: 088c6aa773

Change-Id: Id74637b1d1ca09ec9c0c1c658f70db9567581d5b

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;
         }