Changeset 211673 in webkit

Timestamp:

Feb 4, 2017, 1:40:33 PM (9 years ago)

Author:

yoav@yoav.ws

Message:

Fix memory issues related to preload eviction.
​https://bugs.webkit.org/show_bug.cgi?id=167838

Reviewed by Andreas Kling.

This avoids removing resources from m_preloads during the iteration
by creating a second HashSetList containing the remaining link preloads.

No new tests but this will fix crashes on the leak bots.

• loader/cache/CachedResourceLoader.cpp:

(WebCore::CachedResourceLoader::clearPreloads):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-04  Yoav Weiss  <yoav@yoav.ws>
+
+        Fix memory issues related to preload eviction.
+        https://bugs.webkit.org/show_bug.cgi?id=167838
+
+        Reviewed by Andreas Kling.
+
+        This avoids removing resources from m_preloads during the iteration
+        by creating a second HashSetList containing the remaining link preloads.
+
+        No new tests but this will fix crashes on the leak bots.
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::clearPreloads):
+
 2017-02-04  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp

@@ -1255 +1255 @@
         return;
 
+    std::unique_ptr<ListHashSet<CachedResource*>> remainingLinkPreloads;
     for (auto* resource : *m_preloads) {
-        if (mode == ClearPreloadsMode::ClearSpeculativePreloads && resource->isLinkPreload())
+        ASSERT(resource);
+        if (mode == ClearPreloadsMode::ClearSpeculativePreloads && resource->isLinkPreload()) {
+            if (!remainingLinkPreloads)
+                remainingLinkPreloads = std::make_unique<ListHashSet<CachedResource*>>();
+            remainingLinkPreloads->add(resource);
             continue;
+        }
         resource->decreasePreloadCount();
         bool deleted = resource->deleteIfPossible();
         if (!deleted && resource->preloadResult() == CachedResource::PreloadNotReferenced)
             MemoryCache::singleton().remove(*resource);
-        m_preloads->remove(resource);
-    }
-    if (!m_preloads->size())
-        m_preloads = nullptr;
+    }
+    m_preloads = WTFMove(remainingLinkPreloads);
 }