Title: [153491] branches/safari-537-branch/Source/WebKit2
- Revision
- 153491
- Author
- [email protected]
- Date
- 2013-07-30 14:06:44 -0700 (Tue, 30 Jul 2013)
Log Message
Merged r153486. <rdar://problem/14440207>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (153490 => 153491)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-30 21:00:54 UTC (rev 153490)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-30 21:06:44 UTC (rev 153491)
@@ -1,5 +1,22 @@
2013-07-30 Lucas Forschler <[email protected]>
+ Merge r153486
+
+ 2013-07-30 Tim Horton <[email protected]>
+
+ Null deref under PluginView::handlesPageScaleFactor()
+ https://bugs.webkit.org/show_bug.cgi?id=119231
+ <rdar://problem/14440207>
+
+ Reviewed by Darin Adler.
+
+ Null-check the PluginView in the caller as well.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::handlesPageScaleGesture):
+
+2013-07-30 Lucas Forschler <[email protected]>
+
Merge r153449
2013-07-29 Tim Horton <[email protected]>
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (153490 => 153491)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-07-30 21:00:54 UTC (rev 153490)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-07-30 21:06:44 UTC (rev 153491)
@@ -482,8 +482,7 @@
PluginDocument* pluginDocument = static_cast<PluginDocument*>(m_coreFrame->document());
PluginView* pluginView = static_cast<PluginView*>(pluginDocument->pluginWidget());
-
- return pluginView->handlesPageScaleFactor();
+ return pluginView && pluginView->handlesPageScaleFactor();
}
IntRect WebFrame::contentBounds() const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
