SkPDF/Test: detailed error messages in PDFDeflateWStreamTest

tests/PDFDeflateWStreamTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDeflate.h"
 #include "SkRandom.h"
 #include "Test.h"
@@ skipping 11 matching lines @@
 template <typename T> void* skia_alloc_func(void*, T items, T size) {
     return sk_calloc_throw(SkToSizeT(items) * SkToSizeT(size));
 }
 
 void skia_free_func(void*, void* address) { sk_free(address); }
 
 /**
  *  Use the un-deflate compression algorithm to decompress the data in src,
  *  returning the result.  Returns nullptr if an error occurs.
  */
-SkStreamAsset* stream_inflate(SkStream* src) {
+SkStreamAsset* stream_inflate(skiatest::Reporter* reporter, SkStream* src) {
     SkDynamicMemoryWStream decompressedDynamicMemoryWStream;
     SkWStream* dst = &decompressedDynamicMemoryWStream;
 
     static const size_t kBufferSize = 1024;
     uint8_t inputBuffer[kBufferSize];
     uint8_t outputBuffer[kBufferSize];
     z_stream flateData;
     flateData.zalloc = &skia_alloc_func;
     flateData.zfree = &skia_free_func;
     flateData.opaque = nullptr;
     flateData.next_in = nullptr;
     flateData.avail_in = 0;
     flateData.next_out = outputBuffer;
     flateData.avail_out = kBufferSize;
     int rc;
     rc = inflateInit(&flateData);
-    if (rc != Z_OK)
+    if (rc != Z_OK) {
+        ERRORF(reporter, "Zlib: inflateInit failed");
         return nullptr;
-
+    }
     uint8_t* input = (uint8_t*)src->getMemoryBase();
     size_t inputLength = src->getLength();
     if (input == nullptr || inputLength == 0) {
         input = nullptr;
         flateData.next_in = inputBuffer;
         flateData.avail_in = 0;
     } else {
         flateData.next_in = input;
         flateData.avail_in = SkToUInt(inputLength);
     }
@@ skipping 17 matching lines @@
             if (read == 0)
                 break;
             flateData.next_in = inputBuffer;
             flateData.avail_in = SkToUInt(read);
         }
         rc = inflate(&flateData, Z_NO_FLUSH);
     }
     while (rc == Z_OK) {
         rc = inflate(&flateData, Z_FINISH);
         if (flateData.avail_out < kBufferSize) {
-            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out))
+            if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out)) {
+                ERRORF(reporter, "write failed");
                 return nullptr;
+            }
             flateData.next_out = outputBuffer;
             flateData.avail_out = kBufferSize;
         }
     }
 
     inflateEnd(&flateData);
     if (rc != Z_STREAM_END) {
+        ERRORF(reporter, "Zlib: inflateEnd failed");
         return nullptr;
     }
     return decompressedDynamicMemoryWStream.detachAsStream();
 }
 }  // namespace
 
 DEF_TEST(SkDeflateWStream, r) {
     SkRandom random(123456);
     for (int i = 0; i < 50; ++i) {
         uint32_t size = random.nextULessThan(10000);
@@ skipping 11 matching lines @@
                         SkTMin(size - j, random.nextRangeU(1, 400));
                 if (!deflateWStream.write(&buffer[j], writeSize)) {
                     ERRORF(r, "something went wrong.");
                     return;
                 }
                 j += writeSize;
             }
         }
         SkAutoTDelete<SkStreamAsset> compressed(
                 dynamicMemoryWStream.detachAsStream());
-        SkAutoTDelete<SkStreamAsset> decompressed(stream_inflate(compressed));
+        SkAutoTDelete<SkStreamAsset> decompressed(stream_inflate(r, compressed));
 
+        if (!decompressed) {
+            ERRORF(r, "Decompression failed.");
+            return;
+        }
         if (decompressed->getLength() != size) {
             ERRORF(r, "Decompression failed to get right size [%d]."
                    " %u != %u", i,  (unsigned)(decompressed->getLength()),
                    (unsigned)size);
             SkString s = SkStringPrintf("/tmp/deftst_compressed_%d", i);
             SkFILEWStream o(s.c_str());
             o.writeStream(compressed.get(), compressed->getLength());
             compressed->rewind();
 
             s = SkStringPrintf("/tmp/deftst_input_%d", i);
             SkFILEWStream o2(s.c_str());
             o2.write(&buffer[0], size);
 
             continue;
         }
         uint32_t minLength = SkTMin(size,
                                     (uint32_t)(decompressed->getLength()));
         for (uint32_t i = 0; i < minLength; ++i) {
             uint8_t c;
             SkDEBUGCODE(size_t rb =)decompressed->read(&c, sizeof(uint8_t));
             SkASSERT(sizeof(uint8_t) == rb);
             if (buffer[i] != c) {
                 ERRORF(r, "Decompression failed at byte %u.", (unsigned)i);
                 break;
             }
         }
     }
 }