Title: [167534] trunk/Source/WebKit2
- Revision
- 167534
- Author
- [email protected]
- Date
- 2014-04-19 10:04:52 -0700 (Sat, 19 Apr 2014)
Log Message
Assertion in WebPage::runModal accesses object after it may have been destroyed
https://bugs.webkit.org/show_bug.cgi?id=131875
Reviewed by Anders Carlsson.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::runModal): Ref the WebPage so it's still around so we can
check the m_isRunningModal flag.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167533 => 167534)
--- trunk/Source/WebKit2/ChangeLog 2014-04-19 06:57:27 UTC (rev 167533)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-19 17:04:52 UTC (rev 167534)
@@ -1,3 +1,14 @@
+2014-04-19 Darin Adler <[email protected]>
+
+ Assertion in WebPage::runModal accesses object after it may have been destroyed
+ https://bugs.webkit.org/show_bug.cgi?id=131875
+
+ Reviewed by Anders Carlsson.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::runModal): Ref the WebPage so it's still around so we can
+ check the m_isRunningModal flag.
+
2014-04-18 Commit Queue <[email protected]>
Unreviewed, rolling out r167527.
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167533 => 167534)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-19 06:57:27 UTC (rev 167533)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-19 17:04:52 UTC (rev 167534)
@@ -3698,6 +3698,9 @@
m_isRunningModal = true;
send(Messages::WebPageProxy::RunModal());
+#if !ASSERT_DISABLED
+ Ref<WebPage> protector(*this);
+#endif
RunLoop::run();
ASSERT(!m_isRunningModal);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes