Bug 1780834. If a webp file header specifies ICCP but no ICCP chunk is found just ignore it and continue. r=aosmond

Differential Revision: https://phabricator.services.mozilla.com/D152588

image/decoders/nsWebPDecoder.cpp

@@ -361,14 +361,19 @@ LexerResult nsWebPDecoder::ReadHeader(WebPDemuxer* aDemuxer, bool aIsComplete) {
   if (!IsMetadataDecode() && !mGotColorProfile) {
     if (flags & WebPFeatureFlags::ICCP_FLAG) {
       WebPChunkIterator iter;
-      if (!WebPDemuxGetChunk(aDemuxer, "ICCP", 1, &iter)) {
+      if (WebPDemuxGetChunk(aDemuxer, "ICCP", 1, &iter)) {
-        return aIsComplete ? LexerResult(TerminalState::FAILURE)
+        ApplyColorProfile(reinterpret_cast<const char*>(iter.chunk.bytes),
-                           : LexerResult(Yield::NEED_MORE_DATA);
+                          iter.chunk.size);
-      }
+        WebPDemuxReleaseChunkIterator(&iter);
 
-      ApplyColorProfile(reinterpret_cast<const char*>(iter.chunk.bytes),
+      } else {
-                        iter.chunk.size);
+        MOZ_LOG(sWebPLog, LogLevel::Warning,
-      WebPDemuxReleaseChunkIterator(&iter);
+                ("[this=%p] nsWebPDecoder::ReadHeader header specified ICCP "
+                 "but no ICCP chunk found, ignoring\n",
+                 this));
+
+        ApplyColorProfile(nullptr, 0);
+      }
     } else {
       ApplyColorProfile(nullptr, 0);
     }

image/test/reftest/reftest.list

@@ -51,3 +51,6 @@ skip-if(useDrawSnapshot) include downscaling/reftest.list
 
 # Lossless encoders
 include encoders-lossless/reftest.list
+
+# webp tests
+include webp/reftest.list

image/test/reftest/webp/reftest.list

@@ -0,0 +1 @@
+== icc-bit-no-icc-chunk.webp blue.png