Title: [260595] trunk/Source/WebKit
Revision
260595
Author
[email protected]
Date
2020-04-23 13:28:54 -0700 (Thu, 23 Apr 2020)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (260594 => 260595)


--- trunk/Source/WebKit/ChangeLog	2020-04-23 20:17:47 UTC (rev 260594)
+++ trunk/Source/WebKit/ChangeLog	2020-04-23 20:28:54 UTC (rev 260595)
@@ -1,3 +1,14 @@
+2020-04-23  Chris Dumez  <[email protected]>
+
+        [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  <[email protected]>
 
         All ITP database tables should reference the ObservedDomains table on DELETE CASCADE

Modified: trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm (260594 => 260595)


--- trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm	2020-04-23 20:17:47 UTC (rev 260594)
+++ trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm	2020-04-23 20:28:54 UTC (rev 260595)
@@ -435,9 +435,8 @@
 
     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];
     }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to