Actually fail when we get conflicting marker counts in JPEG
Bug: oss-fuzz:55289
Change-Id: I859b493a71ad6b14937a13fbf492b40bf1f22aaa
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/633517
Reviewed-by: Christopher Cameron <ccameron@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Brian Osman <brianosman@google.com>
Commit-Queue: Christopher Cameron <ccameron@google.com>
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
index dd75513..70b04bb 100644
--- a/src/codec/SkJpegCodec.cpp
+++ b/src/codec/SkJpegCodec.cpp
@@ -165,6 +165,7 @@
// If this does not match the expected part count, then fail.
if (partCount != expectedPartCount) {
SkCodecPrintf("Conflicting marker counts %u vs %u\n", partCount, expectedPartCount);
+ return nullptr;
}
// Make an SkData directly referencing the decoder's data for this part.
