Get rid of leaks in SkCodec::NewFromStream.
SkCodec::NewFromStream claims to delete the passed in SkStream on
failure. This allows the caller to pass an SkStream to the function
and not worry about deleting it depending on the return value.
Most of our SkCodecs did not honor this contract though. Update them
to delete the stream on failure. Further, update SkCodec::NewFromStream
to delete the stream if it did not match any subclass, and delete the
SkCodec if we decided to return NULL because it was too big.
Add a test which tests streams which represent the beginnings of
supported format types but do not contain enough data to create an
SkCodec. The interesting part of the test is when we run it on ASAN,
which will report that we leaked something without the other changes.
BUG=skia:3257
Review URL: https://codereview.chromium.org/1058873006
diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp
index 8252518..26846a4 100644
--- a/tests/CodexTest.cpp
+++ b/tests/CodexTest.cpp
@@ -109,3 +109,32 @@
check(r, "randPixels.png", SkISize::Make(8, 8), true);
check(r, "yellow_rose.png", SkISize::Make(400, 301), true);
}
+
+static void test_invalid_stream(skiatest::Reporter* r, const void* stream, size_t len) {
+ SkCodec* codec = SkCodec::NewFromStream(new SkMemoryStream(stream, len, false));
+ // We should not have gotten a codec. Bots should catch us if we leaked anything.
+ REPORTER_ASSERT(r, !codec);
+}
+
+// Ensure that SkCodec::NewFromStream handles freeing the passed in SkStream,
+// even on failure. Test some bad streams.
+DEF_TEST(Codec_leaks, r) {
+ // No codec should claim this as their format, so this tests SkCodec::NewFromStream.
+ const char nonSupportedStream[] = "hello world";
+ // The other strings should look like the beginning of a file type, so we'll call some
+ // internal version of NewFromStream, which must also delete the stream on failure.
+ const unsigned char emptyPng[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a };
+ const unsigned char emptyJpeg[] = { 0xFF, 0xD8, 0xFF };
+ const char emptyWebp[] = "RIFF1234WEBPVP";
+ const char emptyBmp[] = { 'B', 'M' };
+ const char emptyIco[] = { '\x00', '\x00', '\x01', '\x00' };
+ const char emptyGif[] = "GIFVER";
+
+ test_invalid_stream(r, nonSupportedStream, sizeof(nonSupportedStream));
+ test_invalid_stream(r, emptyPng, sizeof(emptyPng));
+ test_invalid_stream(r, emptyJpeg, sizeof(emptyJpeg));
+ test_invalid_stream(r, emptyWebp, sizeof(emptyWebp));
+ test_invalid_stream(r, emptyBmp, sizeof(emptyBmp));
+ test_invalid_stream(r, emptyIco, sizeof(emptyIco));
+ test_invalid_stream(r, emptyGif, sizeof(emptyGif));
+}