Changeset 280083 in webkit

Timestamp:

Jul 20, 2021, 9:54:58 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Protect m_data when iterating in CachedRawResource::didAddClient
​https://bugs.webkit.org/show_bug.cgi?id=228108
<rdar://80716674>

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-07-20
Reviewed by Chris Dumez.

I think something is destroying m_data when its segments are being iterated.
Protect it so it doesn't get destroyed.
Also, to be on the safe side, check that the client is still a client before using it.

• loader/cache/CachedRawResource.cpp:

(WebCore::CachedRawResource::didAddClient):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-07-20  Alex Christensen  <achristensen@webkit.org>
+
+        Protect m_data when iterating in CachedRawResource::didAddClient
+        https://bugs.webkit.org/show_bug.cgi?id=228108
+        <rdar://80716674>
+
+        Reviewed by Chris Dumez.
+
+        I think something is destroying m_data when its segments are being iterated.
+        Protect it so it doesn't get destroyed.
+        Also, to be on the safe side, check that the client is still a client before using it.
+
+        * loader/cache/CachedRawResource.cpp:
+        (WebCore::CachedRawResource::didAddClient):
+
 2021-07-20  Sam Sneddon  <gsnedders@apple.com>
 

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

@@ -168 +168 @@
             if (!hasClient(*client))
                 return;
-            if (m_data) {
-                m_data->forEachSegment([&](auto& segment) {
-                    client->dataReceived(*this, segment.data(), segment.size());
+            if (auto data = m_data) {
+                data->forEachSegment([&](auto& segment) {
+                    if (hasClient(*client))
+                        client->dataReceived(*this, segment.data(), segment.size());
                 });
             }