Re-enable DrMemory test for ICOImageDecoderTests.parseAndDecodeByteByByte.

third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp

 /*
  * Copyright (c) 2008, 2009, 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 30 matching lines @@
 // Number of bits in .ICO/.CUR used to store the directory and its entries,
 // respectively (doesn't match sizeof values for member structs since we omit
 // some fields).
 static const size_t sizeOfDirectory = 6;
 static const size_t sizeOfDirEntry = 16;
 
 ICOImageDecoder::ICOImageDecoder(AlphaOption alphaOption, GammaAndColorProfileOption colorOptions, size_t maxDecodedBytes)
     : ImageDecoder(alphaOption, colorOptions, maxDecodedBytes)
     , m_fastReader(nullptr)
     , m_decodedOffset(0)
+    , m_dirEntriesCount(0)
 {
 }
 
 ICOImageDecoder::~ICOImageDecoder()
 {
 }
 
 void ICOImageDecoder::onSetData(SegmentReader* data)
 {
     m_fastReader.setData(data);
@@ skipping 114 matching lines @@
     }
 }
 
 bool ICOImageDecoder::decodeDirectory()
 {
     // Read and process directory.
     if ((m_decodedOffset < sizeOfDirectory) && !processDirectory())
         return false;
 
     // Read and process directory entries.
-    return (m_decodedOffset >= (sizeOfDirectory + (m_dirEntries.size() * sizeOfDirEntry))) || processDirectoryEntries();
+    return (m_decodedOffset >= (sizeOfDirectory + (m_dirEntriesCount * sizeOfDirEntry))) || processDirectoryEntries();
 }
 
 bool ICOImageDecoder::decodeAtIndex(size_t index)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());
     const IconDirectoryEntry& dirEntry = m_dirEntries[index];
     const ImageType imageType = imageTypeAtIndex(index);
     if (imageType == Unknown)
         return false; // Not enough data to determine image type yet.
 
@@ skipping 26 matching lines @@
     return !m_pngDecoders[index]->failed() || setFailed();
 }
 
 bool ICOImageDecoder::processDirectory()
 {
     // Read directory.
     ASSERT(!m_decodedOffset);
     if (m_data->size() < sizeOfDirectory)
         return false;
     const uint16_t fileType = readUint16(2);
-    const uint16_t idCount = readUint16(4);
+    m_dirEntriesCount = readUint16(4);
     m_decodedOffset = sizeOfDirectory;
 
     // See if this is an icon filetype we understand, and make sure we have at
     // least one entry in the directory.
-    if (((fileType != ICON) && (fileType != CURSOR)) || (!idCount))
+    if (((fileType != ICON) && (fileType != CURSOR)) || (!m_dirEntriesCount))
         return setFailed();
 
     m_fileType = static_cast<FileType>(fileType);
-
-    // Enlarge member vectors to hold all the entries.
-    m_dirEntries.resize(idCount);
-    m_bmpReaders.resize(idCount);
-    m_pngDecoders.resize(idCount);
     return true;
 }
 
 bool ICOImageDecoder::processDirectoryEntries()
 {
     // Read directory entries.
     ASSERT(m_decodedOffset == sizeOfDirectory);
-    if ((m_decodedOffset > m_data->size()) || ((m_data->size() - m_decodedOffset) < (m_dirEntries.size() * sizeOfDirEntry)))
+    if ((m_decodedOffset > m_data->size()) || ((m_data->size() - m_decodedOffset) < (m_dirEntriesCount * sizeOfDirEntry)))
         return false;
+
+    // Enlarge member vectors to hold all the entries.
+    m_dirEntries.resize(m_dirEntriesCount);
+    m_bmpReaders.resize(m_dirEntriesCount);
+    m_pngDecoders.resize(m_dirEntriesCount);
+
     for (IconDirectoryEntries::iterator i(m_dirEntries.begin()); i != m_dirEntries.end(); ++i)
         *i = readDirectoryEntry();  // Updates m_decodedOffset.
 
     // Make sure the specified image offsets are past the end of the directory
     // entries.
     for (IconDirectoryEntries::iterator i(m_dirEntries.begin()); i != m_dirEntries.end(); ++i) {
         if (i->m_imageOffset < m_decodedOffset)
             return setFailed();
     }
 
@@ skipping 60 matching lines @@
     ASSERT_WITH_SECURITY_IMPLICATION(index < m_dirEntries.size());
     const uint32_t imageOffset = m_dirEntries[index].m_imageOffset;
     if ((imageOffset > m_data->size()) || ((m_data->size() - imageOffset) < 4))
         return Unknown;
     char buffer[4];
     const char* data = m_fastReader.getConsecutiveData(imageOffset, 4, buffer);
     return strncmp(data, "\x89PNG", 4) ? BMP : PNG;
 }
 
 } // namespace blink