Fix rewinding bug in SkJpegCodec
Performing a sampled and/or subset decode will create some state
in SkJpegCodec. If we fail to clean up this state properly,
subsequent decodes may try to reuse (and potentailly overflow)
the leftover memory.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2161593003
Committed: https://skia.googlesource.com/skia/+/4ecb8ab556214c9337f56bc36d50e4d7c655ac7a
Review-Url: https://codereview.chromium.org/2161593003
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index 12d6ac8..b8b957f 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -1012,3 +1012,32 @@
REPORTER_ASSERT(r, !codec);
}
+
+DEF_TEST(Codec_jpeg_rewind, r) {
+ const char* path = "mandrill_512_q075.jpg";
+ SkAutoTDelete<SkStream> stream(resource(path));
+ if (!stream) {
+ SkDebugf("Missing resource '%s'\n", path);
+ return;
+ }
+ SkAutoTDelete<SkAndroidCodec> codec(SkAndroidCodec::NewFromStream(stream.release()));
+ if (!codec) {
+ ERRORF(r, "Unable to create codec '%s'.", path);
+ return;
+ }
+
+ const int width = codec->getInfo().width();
+ const int height = codec->getInfo().height();
+ size_t rowBytes = sizeof(SkPMColor) * width;
+ SkAutoMalloc pixelStorage(height * rowBytes);
+
+ // Perform a sampled decode.
+ SkAndroidCodec::AndroidOptions opts;
+ opts.fSampleSize = 12;
+ codec->getAndroidPixels(codec->getInfo().makeWH(width / 12, height / 12), pixelStorage.get(),
+ rowBytes, &opts);
+
+ // Rewind the codec and perform a full image decode.
+ SkCodec::Result result = codec->getPixels(codec->getInfo(), pixelStorage.get(), rowBytes);
+ REPORTER_ASSERT(r, SkCodec::kSuccess == result);
+}