Fix handling of broken GIFs with weird frame sizes

Source/platform/image-decoders/gif/GIFImageDecoderTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/StringHasher.h"
 #include "wtf/Vector.h"
 #include <gtest/gtest.h>
 
 using namespace blink;
 
 namespace {
 
-PassRefPtr<SharedBuffer> readFile(const char* fileName)
+const char decodersTestingDir[] = "Source/platform/image-decoders/testing";
+const char layoutTestResourcesDir[] = "LayoutTests/fast/images/resources";
+const char webTestsDataDir[] = "Source/web/tests/data";
+
+PassRefPtr<SharedBuffer> readFile(const char* dir, const char* fileName)
 {
     String filePath = Platform::current()->unitTestSupport()->webKitRootDir();
+    filePath.append("/");
+    filePath.append(dir);
+    filePath.append("/");
     filePath.append(fileName);
 
     return Platform::current()->unitTestSupport()->readFromFile(filePath);
 }
 
 PassOwnPtr<GIFImageDecoder> createDecoder()
 {
     return adoptPtr(new GIFImageDecoder(ImageSource::AlphaNotPremultiplied, ImageSource::GammaAndColorProfileApplied, ImageDecoder::noDecodedImageByteLimit));
 }
 
 unsigned hashSkBitmap(const SkBitmap& bitmap)
 {
     return StringHasher::hashMemory(bitmap.getPixels(), bitmap.getSize());
 }
 
 void createDecodingBaseline(SharedBuffer* data, Vector<unsigned>* baselineHashes)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
     decoder->setData(data, true);
     size_t frameCount = decoder->frameCount();
     for (size_t i = 0; i < frameCount; ++i) {
         ImageFrame* frame = decoder->frameBufferAtIndex(i);
         baselineHashes->append(hashSkBitmap(frame->getSkBitmap()));
     }
 }
 
-void testRandomFrameDecode(const char* gifFile)
+void testRandomFrameDecode(const char* dir, const char* gifFile)
 {
     SCOPED_TRACE(gifFile);
 
-    RefPtr<SharedBuffer> fullData = readFile(gifFile);
+    RefPtr<SharedBuffer> fullData = readFile(dir, gifFile);
     ASSERT_TRUE(fullData.get());
     Vector<unsigned> baselineHashes;
     createDecodingBaseline(fullData.get(), &baselineHashes);
     size_t frameCount = baselineHashes.size();
 
     // Random decoding should get the same results as sequential decoding.
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
     decoder->setData(fullData.get(), true);
     const size_t skippingStep = 5;
     for (size_t i = 0; i < skippingStep; ++i) {
         for (size_t j = i; j < frameCount; j += skippingStep) {
             SCOPED_TRACE(testing::Message() << "Random i:" << i << " j:" << j);
             ImageFrame* frame = decoder->frameBufferAtIndex(j);
             EXPECT_EQ(baselineHashes[j], hashSkBitmap(frame->getSkBitmap()));
         }
     }
 
     // Decoding in reverse order.
     decoder = createDecoder();
     decoder->setData(fullData.get(), true);
     for (size_t i = frameCount; i; --i) {
         SCOPED_TRACE(testing::Message() << "Reverse i:" << i);
         ImageFrame* frame = decoder->frameBufferAtIndex(i - 1);
         EXPECT_EQ(baselineHashes[i - 1], hashSkBitmap(frame->getSkBitmap()));
     }
 }
 
-void testRandomDecodeAfterClearFrameBufferCache(const char* gifFile)
+void testRandomDecodeAfterClearFrameBufferCache(const char* dir, const char* gifFile)
 {
     SCOPED_TRACE(gifFile);
 
-    RefPtr<SharedBuffer> data = readFile(gifFile);
+    RefPtr<SharedBuffer> data = readFile(dir, gifFile);
     ASSERT_TRUE(data.get());
     Vector<unsigned> baselineHashes;
     createDecodingBaseline(data.get(), &baselineHashes);
     size_t frameCount = baselineHashes.size();
 
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
     decoder->setData(data.get(), true);
     for (size_t clearExceptFrame = 0; clearExceptFrame < frameCount; ++clearExceptFrame) {
         decoder->clearCacheExceptFrame(clearExceptFrame);
         const size_t skippingStep = 5;
         for (size_t i = 0; i < skippingStep; ++i) {
             for (size_t j = 0; j < frameCount; j += skippingStep) {
                 SCOPED_TRACE(testing::Message() << "Random i:" << i << " j:" << j);
                 ImageFrame* frame = decoder->frameBufferAtIndex(j);
                 EXPECT_EQ(baselineHashes[j], hashSkBitmap(frame->getSkBitmap()));
             }
         }
     }
 }
 
 } // namespace
 
 TEST(GIFImageDecoderTest, decodeTwoFrames)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/animated.gif");
+    RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
     ASSERT_TRUE(data.get());
     decoder->setData(data.get(), true);
     EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
 
     ImageFrame* frame = decoder->frameBufferAtIndex(0);
     uint32_t generationID0 = frame->getSkBitmap().getGenerationID();
     EXPECT_EQ(ImageFrame::FrameComplete, frame->status());
     EXPECT_EQ(16, frame->getSkBitmap().width());
     EXPECT_EQ(16, frame->getSkBitmap().height());
 
     frame = decoder->frameBufferAtIndex(1);
     uint32_t generationID1 = frame->getSkBitmap().getGenerationID();
     EXPECT_EQ(ImageFrame::FrameComplete, frame->status());
     EXPECT_EQ(16, frame->getSkBitmap().width());
     EXPECT_EQ(16, frame->getSkBitmap().height());
     EXPECT_TRUE(generationID0 != generationID1);
 
     EXPECT_EQ(2u, decoder->frameCount());
     EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
 }
 
 TEST(GIFImageDecoderTest, parseAndDecode)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/animated.gif");
+    RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
     ASSERT_TRUE(data.get());
     decoder->setData(data.get(), true);
     EXPECT_EQ(cAnimationLoopOnce, decoder->repetitionCount());
 
     // This call will parse the entire file.
     EXPECT_EQ(2u, decoder->frameCount());
 
     ImageFrame* frame = decoder->frameBufferAtIndex(0);
     EXPECT_EQ(ImageFrame::FrameComplete, frame->status());
     EXPECT_EQ(16, frame->getSkBitmap().width());
     EXPECT_EQ(16, frame->getSkBitmap().height());
 
     frame = decoder->frameBufferAtIndex(1);
     EXPECT_EQ(ImageFrame::FrameComplete, frame->status());
     EXPECT_EQ(16, frame->getSkBitmap().width());
     EXPECT_EQ(16, frame->getSkBitmap().height());
     EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
 }
 
 TEST(GIFImageDecoderTest, parseByteByByte)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/animated.gif");
+    RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
     ASSERT_TRUE(data.get());
 
     size_t frameCount = 0;
 
     // Pass data to decoder byte by byte.
     for (size_t length = 1; length <= data->size(); ++length) {
         RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
         decoder->setData(tempData.get(), length == data->size());
 
         EXPECT_LE(frameCount, decoder->frameCount());
         frameCount = decoder->frameCount();
     }
 
     EXPECT_EQ(2u, decoder->frameCount());
 
     decoder->frameBufferAtIndex(0);
     decoder->frameBufferAtIndex(1);
     EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
 }
 
 TEST(GIFImageDecoderTest, parseAndDecodeByteByByte)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/animated-gif-with-offsets.gif");
+    RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated-gif-with-offsets.gif");
     ASSERT_TRUE(data.get());
 
     size_t frameCount = 0;
     size_t framesDecoded = 0;
 
     // Pass data to decoder byte by byte.
     for (size_t length = 1; length <= data->size(); ++length) {
         RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), length);
         decoder->setData(tempData.get(), length == data->size());
 
         EXPECT_LE(frameCount, decoder->frameCount());
         frameCount = decoder->frameCount();
 
         ImageFrame* frame = decoder->frameBufferAtIndex(frameCount - 1);
         if (frame && frame->status() == ImageFrame::FrameComplete && framesDecoded < frameCount)
             ++framesDecoded;
     }
 
     EXPECT_EQ(5u, decoder->frameCount());
     EXPECT_EQ(5u, framesDecoded);
     EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
 }
 
 TEST(GIFImageDecoderTest, brokenSecondFrame)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/Source/web/tests/data/broken.gif");
+    RefPtr<SharedBuffer> data = readFile(webTestsDataDir, "broken.gif");
     ASSERT_TRUE(data.get());
     decoder->setData(data.get(), true);
 
     // One frame is detected but cannot be decoded.
     EXPECT_EQ(1u, decoder->frameCount());
     ImageFrame* frame = decoder->frameBufferAtIndex(1);
     EXPECT_FALSE(frame);
 }
 
 TEST(GIFImageDecoderTest, progressiveDecode)
 {
-    RefPtr<SharedBuffer> fullData = readFile("/Source/web/tests/data/radient.gif");
+    RefPtr<SharedBuffer> fullData = readFile(webTestsDataDir, "radient.gif");
     ASSERT_TRUE(fullData.get());
     const size_t fullLength = fullData->size();
 
     OwnPtr<GIFImageDecoder> decoder;
     ImageFrame* frame;
 
     Vector<unsigned> truncatedHashes;
     Vector<unsigned> progressiveHashes;
 
     // Compute hashes when the file is truncated.
@@ skipping 32 matching lines @@
             break;
         }
     }
     EXPECT_TRUE(match);
 }
 
 TEST(GIFImageDecoderTest, allDataReceivedTruncation)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/animated.gif");
+    RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
     ASSERT_TRUE(data.get());
 
     ASSERT_GE(data->size(), 10u);
     RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), data->size() - 10);
     decoder->setData(tempData.get(), true);
 
     EXPECT_EQ(2u, decoder->frameCount());
     EXPECT_FALSE(decoder->failed());
 
     decoder->frameBufferAtIndex(0);
     EXPECT_FALSE(decoder->failed());
     decoder->frameBufferAtIndex(1);
     EXPECT_TRUE(decoder->failed());
 }
 
 TEST(GIFImageDecoderTest, frameIsComplete)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/animated.gif");
+    RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
     ASSERT_TRUE(data.get());
     decoder->setData(data.get(), true);
 
     EXPECT_EQ(2u, decoder->frameCount());
     EXPECT_FALSE(decoder->failed());
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(1));
     EXPECT_EQ(cAnimationLoopInfinite, decoder->repetitionCount());
 }
 
 TEST(GIFImageDecoderTest, frameIsCompleteLoading)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> data = readFile("/LayoutTests/fast/images/resources/animated.gif");
+    RefPtr<SharedBuffer> data = readFile(layoutTestResourcesDir, "animated.gif");
     ASSERT_TRUE(data.get());
 
     ASSERT_GE(data->size(), 10u);
     RefPtr<SharedBuffer> tempData = SharedBuffer::create(data->data(), data->size() - 10);
     decoder->setData(tempData.get(), false);
 
     EXPECT_EQ(2u, decoder->frameCount());
     EXPECT_FALSE(decoder->failed());
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
     EXPECT_FALSE(decoder->frameIsCompleteAtIndex(1));
 
     decoder->setData(data.get(), true);
     EXPECT_EQ(2u, decoder->frameCount());
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(0));
     EXPECT_TRUE(decoder->frameIsCompleteAtIndex(1));
 }
 
 TEST(GIFImageDecoderTest, badTerminator)
 {
-    RefPtr<SharedBuffer> referenceData = readFile("/Source/web/tests/data/radient.gif");
-    RefPtr<SharedBuffer> testData = readFile("/Source/web/tests/data/radient-bad-terminator.gif");
+    RefPtr<SharedBuffer> referenceData = readFile(webTestsDataDir, "radient.gif");
+    RefPtr<SharedBuffer> testData = readFile(webTestsDataDir, "radient-bad-terminator.gif");
     ASSERT_TRUE(referenceData.get());
     ASSERT_TRUE(testData.get());
 
     OwnPtr<GIFImageDecoder> referenceDecoder(createDecoder());
     referenceDecoder->setData(referenceData.get(), true);
     EXPECT_EQ(1u, referenceDecoder->frameCount());
     ImageFrame* referenceFrame = referenceDecoder->frameBufferAtIndex(0);
     ASSERT(referenceFrame);
 
     OwnPtr<GIFImageDecoder> testDecoder(createDecoder());
     testDecoder->setData(testData.get(), true);
     EXPECT_EQ(1u, testDecoder->frameCount());
     ImageFrame* testFrame = testDecoder->frameBufferAtIndex(0);
     ASSERT(testFrame);
 
     EXPECT_EQ(hashSkBitmap(referenceFrame->getSkBitmap()), hashSkBitmap(testFrame->getSkBitmap()));
 }
 
 TEST(GIFImageDecoderTest, updateRequiredPreviousFrameAfterFirstDecode)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
-    RefPtr<SharedBuffer> fullData = readFile("/LayoutTests/fast/images/resources/animated-10color.gif");
+    RefPtr<SharedBuffer> fullData = readFile(layoutTestResourcesDir, "animated-10color.gif");
     ASSERT_TRUE(fullData.get());
 
     // Give it data that is enough to parse but not decode in order to check the status
     // of requiredPreviousFrameIndex before decoding.
     size_t partialSize = 1;
     do {
         RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), partialSize);
         decoder->setData(data.get(), false);
         ++partialSize;
     } while (!decoder->frameCount() || decoder->frameBufferAtIndex(0)->status() == ImageFrame::FrameEmpty);
 
     EXPECT_EQ(kNotFound, decoder->frameBufferAtIndex(0)->requiredPreviousFrameIndex());
     unsigned frameCount = decoder->frameCount();
     for (size_t i = 1; i < frameCount; ++i)
         EXPECT_EQ(i - 1, decoder->frameBufferAtIndex(i)->requiredPreviousFrameIndex());
 
     decoder->setData(fullData.get(), true);
     for (size_t i = 0; i < frameCount; ++i)
         EXPECT_EQ(kNotFound, decoder->frameBufferAtIndex(i)->requiredPreviousFrameIndex());
 }
 
 TEST(GIFImageDecoderTest, randomFrameDecode)
 {
     // Single frame image.
-    testRandomFrameDecode("/Source/web/tests/data/radient.gif");
+    testRandomFrameDecode(webTestsDataDir, "radient.gif");
     // Multiple frame images.
-    testRandomFrameDecode("/LayoutTests/fast/images/resources/animated-gif-with-offsets.gif");
-    testRandomFrameDecode("/LayoutTests/fast/images/resources/animated-10color.gif");
+    testRandomFrameDecode(layoutTestResourcesDir, "animated-gif-with-offsets.gif");
+    testRandomFrameDecode(layoutTestResourcesDir, "animated-10color.gif");
 }
 
 TEST(GIFImageDecoderTest, randomDecodeAfterClearFrameBufferCache)
 {
     // Single frame image.
-    testRandomDecodeAfterClearFrameBufferCache("/Source/web/tests/data/radient.gif");
+    testRandomDecodeAfterClearFrameBufferCache(webTestsDataDir, "radient.gif");
     // Multiple frame images.
-    testRandomDecodeAfterClearFrameBufferCache("/LayoutTests/fast/images/resources/animated-gif-with-offsets.gif");
-    testRandomDecodeAfterClearFrameBufferCache("/LayoutTests/fast/images/resources/animated-10color.gif");
+    testRandomDecodeAfterClearFrameBufferCache(layoutTestResourcesDir, "animated-gif-with-offsets.gif");
+    testRandomDecodeAfterClearFrameBufferCache(layoutTestResourcesDir, "animated-10color.gif");
 }
 
 TEST(GIFImageDecoderTest, resumePartialDecodeAfterClearFrameBufferCache)
 {
-    RefPtr<SharedBuffer> fullData = readFile("/LayoutTests/fast/images/resources/animated-10color.gif");
+    RefPtr<SharedBuffer> fullData = readFile(layoutTestResourcesDir, "animated-10color.gif");
     ASSERT_TRUE(fullData.get());
     Vector<unsigned> baselineHashes;
     createDecodingBaseline(fullData.get(), &baselineHashes);
     size_t frameCount = baselineHashes.size();
 
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
     // Let frame 0 be partially decoded.
     size_t partialSize = 1;
     do {
@@ skipping 12 matching lines @@
     // Resume decoding of the first frame.
     ImageFrame* firstFrame = decoder->frameBufferAtIndex(0);
     EXPECT_EQ(ImageFrame::FrameComplete, firstFrame->status());
     EXPECT_EQ(baselineHashes[0], hashSkBitmap(firstFrame->getSkBitmap()));
 }
 
 // The first LZW codes in the image are invalid values that try to create a loop
 // in the dictionary. Decoding should fail, but not infinitely loop or corrupt memory.
 TEST(GIFImageDecoderTest, badInitialCode)
 {
-    RefPtr<SharedBuffer> testData = readFile("/Source/platform/image-decoders/testing/bad-initial-code.gif");
+    RefPtr<SharedBuffer> testData = readFile(decodersTestingDir, "bad-initial-code.gif");
     ASSERT_TRUE(testData.get());
 
     OwnPtr<GIFImageDecoder> testDecoder(createDecoder());
     testDecoder->setData(testData.get(), true);
     EXPECT_EQ(1u, testDecoder->frameCount());
     ASSERT_TRUE(testDecoder->frameBufferAtIndex(0));
     EXPECT_TRUE(testDecoder->failed());
 }
 
 // The image has an invalid LZW code that exceeds dictionary size. Decoding should fail.
 TEST(GIFImageDecoderTest, badCode)
 {
-    RefPtr<SharedBuffer> testData = readFile("/Source/platform/image-decoders/testing/bad-code.gif");
+    RefPtr<SharedBuffer> testData = readFile(decodersTestingDir, "bad-code.gif");
     ASSERT_TRUE(testData.get());
 
     OwnPtr<GIFImageDecoder> testDecoder(createDecoder());
     testDecoder->setData(testData.get(), true);
     EXPECT_EQ(1u, testDecoder->frameCount());
     ASSERT_TRUE(testDecoder->frameBufferAtIndex(0));
     EXPECT_TRUE(testDecoder->failed());
 }
 
 TEST(GIFImageDecoderTest, invalidDisposalMethod)
 {
     OwnPtr<GIFImageDecoder> decoder = createDecoder();
 
     // The image has 2 frames, with disposal method 4 and 5, respectively.
-    RefPtr<SharedBuffer> data = readFile("/Source/web/tests/data/invalid-disposal-method.gif");
+    RefPtr<SharedBuffer> data = readFile(webTestsDataDir, "invalid-disposal-method.gif");
     ASSERT_TRUE(data.get());
     decoder->setData(data.get(), true);
 
     EXPECT_EQ(2u, decoder->frameCount());
     // Disposal method 4 is converted to ImageFrame::DisposeOverwritePrevious.
     EXPECT_EQ(ImageFrame::DisposeOverwritePrevious, decoder->frameBufferAtIndex(0)->disposalMethod());
     // Disposal method 5 is ignored.
     EXPECT_EQ(ImageFrame::DisposeNotSpecified, decoder->frameBufferAtIndex(1)->disposalMethod());
 }
+
+TEST(GIFImageDecoderTest, firstFrameHasGreaterSizeThanScreenSize)
+{
+    RefPtr<SharedBuffer> fullData = readFile(decodersTestingDir, "first-frame-has-greater-size-than-screen-size.gif");
+    ASSERT_TRUE(fullData.get());
+
+    OwnPtr<GIFImageDecoder> decoder;
+    IntSize frameSize;
+
+    // Compute hashes when the file is truncated.
+    for (size_t i = 1; i <= fullData->size(); ++i) {
+        decoder = createDecoder();
+        RefPtr<SharedBuffer> data = SharedBuffer::create(fullData->data(), i);
+        decoder->setData(data.get(), i == fullData->size());
+
+        if (decoder->isSizeAvailable() && !frameSize.width() && !frameSize.height()) {
+            frameSize = decoder->decodedSize();
+            continue;
+        }
+
+        ASSERT_EQ(frameSize.width(), decoder->decodedSize().width());
+        ASSERT_EQ(frameSize.height(), decoder->decodedSize().height());
+    }
+}