Title: [220878] trunk/Source/WebKit
Revision
220878
Author
[email protected]
Date
2017-08-17 14:40:15 -0700 (Thu, 17 Aug 2017)

Log Message

REGRESSION (r220601): Crash under ProcessAssertion::markAsInvalidated()
https://bugs.webkit.org/show_bug.cgi?id=175685
<rdar://problem/33868623>

Reviewed by Sam Weinig.

After r220601, it is no longer safe to call a default-initialized WTF::Function.

* UIProcess/ios/ProcessAssertionIOS.mm:
(WebKit::ProcessAssertion::markAsInvalidated):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (220877 => 220878)


--- trunk/Source/WebKit/ChangeLog	2017-08-17 21:23:46 UTC (rev 220877)
+++ trunk/Source/WebKit/ChangeLog	2017-08-17 21:40:15 UTC (rev 220878)
@@ -1,3 +1,16 @@
+2017-08-17  Chris Dumez  <[email protected]>
+
+        REGRESSION (r220601): Crash under ProcessAssertion::markAsInvalidated()
+        https://bugs.webkit.org/show_bug.cgi?id=175685
+        <rdar://problem/33868623>
+
+        Reviewed by Sam Weinig.
+
+        After r220601, it is no longer safe to call a default-initialized WTF::Function.
+
+        * UIProcess/ios/ProcessAssertionIOS.mm:
+        (WebKit::ProcessAssertion::markAsInvalidated):
+
 2017-08-17  Andreas Kling  <[email protected]>
 
         Disable CSS regions at compile time

Modified: trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm (220877 => 220878)


--- trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm	2017-08-17 21:23:46 UTC (rev 220877)
+++ trunk/Source/WebKit/UIProcess/ios/ProcessAssertionIOS.mm	2017-08-17 21:40:15 UTC (rev 220878)
@@ -203,7 +203,8 @@
     ASSERT(RunLoop::isMain());
 
     m_validity = Validity::No;
-    m_invalidationCallback();
+    if (m_invalidationCallback)
+        m_invalidationCallback();
 }
 
 void ProcessAssertion::setState(AssertionState assertionState)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to