Merge 52833 - Public GIF decoder should stop decoding when allocation fails...

WebCore/platform/image-decoders/gif/GIFImageDecoder.cpp

 /*
  * Copyright (C) 2006 Apple Computer, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 313 matching lines @@
     }
 
     // Update our status to be partially complete.
     buffer->setStatus(RGBA32Buffer::FramePartial);
 
     // Reset the alpha pixel tracker for this frame.
     m_currentBufferSawAlpha = false;
     return true;
 }
 
-void GIFImageDecoder::haveDecodedRow(unsigned frameIndex,
+bool GIFImageDecoder::haveDecodedRow(unsigned frameIndex,
                                      unsigned char* rowBuffer,
                                      unsigned char* rowEnd,
                                      unsigned rowNumber,
                                      unsigned repeatCount,
                                      bool writeTransparentPixels)
 {
     // The pixel data and coordinates supplied to us are relative to the frame's
     // origin within the entire image size, i.e.
     // (m_reader->frameXOffset(), m_reader->frameYOffset()).
     int x = m_reader->frameXOffset();
     const int y = m_reader->frameYOffset() + rowNumber;
 
     // Sanity-check the arguments.
     if ((rowBuffer == 0) || (y >= size().height()))
-        return;
+        return true;
 
     // Get the colormap.
     unsigned colorMapSize;
     unsigned char* colorMap;
     m_reader->getColorMap(colorMap, colorMapSize);
     if (!colorMap)
-        return;
+        return true;
 
     // Initialize the frame if necessary.
     RGBA32Buffer& buffer = m_frameBufferCache[frameIndex];
     if ((buffer.status() == RGBA32Buffer::FrameEmpty) && !initFrameBuffer(frameIndex))
-        return;
+        return false;
 
     // Write one row's worth of data into the frame.  There is no guarantee that
     // (rowEnd - rowBuffer) == (size().width() - m_reader->frameXOffset()), so
     // we must ensure we don't run off the end of either the source data or the
     // row's X-coordinates.
     for (unsigned char* sourceAddr = rowBuffer; (sourceAddr != rowEnd) && (x < size().width()); ++sourceAddr, ++x) {
         const unsigned char sourceValue = *sourceAddr;
         if ((!m_reader->isTransparent() || (sourceValue != m_reader->transparentPixel())) && (sourceValue < colorMapSize)) {
             const size_t colorIndex = static_cast<size_t>(sourceValue) * 3;
             buffer.setRGBA(x, y, colorMap[colorIndex], colorMap[colorIndex + 1], colorMap[colorIndex + 2], 255);
         } else {
             m_currentBufferSawAlpha = true;
             // We may or may not need to write transparent pixels to the buffer.
             // If we're compositing against a previous image, it's wrong, and if
             // we're writing atop a cleared, fully transparent buffer, it's
             // unnecessary; but if we're decoding an interlaced gif and
             // displaying it "Haeberli"-style, we must write these for passes
             // beyond the first, or the initial passes will "show through" the
             // later ones.
             if (writeTransparentPixels)
                 buffer.setRGBA(x, y, 0, 0, 0, 0);
         }
     }
 
     // Tell the frame to copy the row data if need be.
     if (repeatCount > 1)
         buffer.copyRowNTimes(m_reader->frameXOffset(), x, y, std::min(y + static_cast<int>(repeatCount), size().height()));
+
+    return true;
 }
 
 void GIFImageDecoder::frameComplete(unsigned frameIndex, unsigned frameDuration, RGBA32Buffer::FrameDisposalMethod disposalMethod)
 {
     // Initialize the frame if necessary.  Some GIFs insert do-nothing frames,
     // in which case we never reach haveDecodedRow() before getting here.
     RGBA32Buffer& buffer = m_frameBufferCache[frameIndex];
     if ((buffer.status() == RGBA32Buffer::FrameEmpty) && !initFrameBuffer(frameIndex))
         return;
 
@@ skipping 37 matching lines @@
 
 void GIFImageDecoder::gifComplete()
 {
     if (m_reader)
         m_repetitionCount = m_reader->repetitionCount();
     delete m_reader;
     m_reader = 0;
 }
 
 } // namespace WebCore