Changeset 246382 in webkit

Timestamp:

Jun 12, 2019 3:36:31 PM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Add assertions to help debug crash at WebKit::HistoryEntryDataEncoder::operator<<
​https://bugs.webkit.org/show_bug.cgi?id=198766

Reviewed by Geoffrey Garen.

• Shared/SessionState.h:

(WebKit::FrameState::~FrameState):

• UIProcess/API/C/WKPage.cpp:

(WKPageCopySessionState):

• UIProcess/mac/LegacySessionStateCoding.cpp:

(WebKit::HistoryEntryDataEncoder::encodeFixedLengthData):
(WebKit::encodeFrameStateNode):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/SessionState.h (modified) (1 diff)
• UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• UIProcess/mac/LegacySessionStateCoding.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-12  Sihui Liu  <sihui_liu@apple.com>
+
+        Add assertions to help debug crash at WebKit::HistoryEntryDataEncoder::operator<<
+        https://bugs.webkit.org/show_bug.cgi?id=198766
+
+        Reviewed by Geoffrey Garen.
+
+        * Shared/SessionState.h:
+        (WebKit::FrameState::~FrameState):
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageCopySessionState):
+        * UIProcess/mac/LegacySessionStateCoding.cpp:
+        (WebKit::HistoryEntryDataEncoder::encodeFixedLengthData):
+        (WebKit::encodeFrameStateNode):
+
 2019-06-12  Ludovico de Nittis  <ludovico.denittis@collabora.com>
 

trunk/Source/WebKit/Shared/SessionState.h

@@ -112 +112 @@
 
     Vector<FrameState> children;
+
+    // This is only used to help debug <rdar://problem/48634553>.
+    bool isDestructed { false };
+    ~FrameState() { isDestructed = true; }
 };
 

trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

@@ -481 +481 @@
     });
 
+    auto data = encodeLegacySessionState(sessionState);
     if (shouldReturnData)
-        return toAPI(encodeLegacySessionState(sessionState).leakRef());
+        return toAPI(data.leakRef());
 
     return toAPI(&API::SessionState::create(WTFMove(sessionState)).leakRef());

trunk/Source/WebKit/UIProcess/mac/LegacySessionStateCoding.cpp

@@ -209 +209 @@
     void encodeFixedLengthData(const uint8_t* data, size_t size, unsigned alignment)
     {
+        RELEASE_ASSERT(data || !size);
         ASSERT(!(reinterpret_cast<uintptr_t>(data) % alignment));
 
@@ -319 +320 @@
     encoder << static_cast<uint64_t>(frameState.children.size());
 
+    RELEASE_ASSERT(!frameState.isDestructed);
     for (const auto& childFrameState : frameState.children) {
+        RELEASE_ASSERT(!childFrameState.isDestructed);
         encoder << childFrameState.originalURLString;
         encoder << childFrameState.urlString;