Title: [98013] trunk/Source/WebKit2
- Revision
- 98013
- Author
- [email protected]
- Date
- 2011-10-20 12:34:05 -0700 (Thu, 20 Oct 2011)
Log Message
<rdar://problem/9412849> and https://bugs.webkit.org/show_bug.cgi?id=70535
WK2 - Crash deref'ing a null context menu
Reviewed by Darin Adler.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didSelectItemFromActiveContextMenu): In some cases that we still can't reproduce,
this message can be received in the WebProcess after the context menu has been cleared, leading
to a crash. Turning the ASSERT in to an early return will prevent the crash while we try to learn more
about how this could happen.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (98012 => 98013)
--- trunk/Source/WebKit2/ChangeLog 2011-10-20 19:28:01 UTC (rev 98012)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-20 19:34:05 UTC (rev 98013)
@@ -1,3 +1,16 @@
+2011-10-20 Brady Eidson <[email protected]>
+
+ <rdar://problem/9412849> and https://bugs.webkit.org/show_bug.cgi?id=70535
+ WK2 - Crash deref'ing a null context menu
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didSelectItemFromActiveContextMenu): In some cases that we still can't reproduce,
+ this message can be received in the WebProcess after the context menu has been cleared, leading
+ to a crash. Turning the ASSERT in to an early return will prevent the crash while we try to learn more
+ about how this could happen.
+
2011-10-20 Gustavo Noronha Silva <[email protected]>
GTK+ build fix. Wk2 documentation will be dealt with in future
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (98012 => 98013)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-20 19:28:01 UTC (rev 98012)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2011-10-20 19:34:05 UTC (rev 98013)
@@ -2072,7 +2072,9 @@
void WebPage::didSelectItemFromActiveContextMenu(const WebContextMenuItemData& item)
{
- ASSERT(m_contextMenu);
+ if (!m_contextMenu)
+ return;
+
m_contextMenu->itemSelected(item);
m_contextMenu = 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
