Changeset 260595 in webkit

Timestamp:

Apr 23, 2020 1:28:54 PM (4 years ago)

Author:

Chris Dumez

Message:

[iOS] Crash on RunningBoard process assertion invalidation
​https://bugs.webkit.org/show_bug.cgi?id=210873
<rdar://problem/62194917>

Unreviewed, nil out the observer only after we've removed it to fix crashes on the bots.

• UIProcess/ios/ProcessAssertionIOS.mm:

(WebKit::ProcessAssertion::~ProcessAssertion):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/ProcessAssertionIOS.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-23  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Crash on RunningBoard process assertion invalidation
+        https://bugs.webkit.org/show_bug.cgi?id=210873
+        <rdar://problem/62194917>
+
+        Unreviewed, nil out the observer only after we've removed it to fix crashes on the bots.
+
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+        (WebKit::ProcessAssertion::~ProcessAssertion):
+
 2020-04-23  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm

@@ -436 +436 @@
     if (m_rbsAssertion) {
         m_delegate.get().invalidationCallback = nil;
+        [m_rbsAssertion removeObserver:m_delegate.get()];
         m_delegate = nil;
-
-        [m_rbsAssertion removeObserver:m_delegate.get()];
         [m_rbsAssertion invalidate];
     }