Title: [153487] trunk/Source/WebKit2
- Revision
- 153487
- Author
- [email protected]
- Date
- 2013-07-30 12:42:31 -0700 (Tue, 30 Jul 2013)
Log Message
Null deref under WebPage::scaledSnapshotWithOptions
https://bugs.webkit.org/show_bug.cgi?id=119243
<rdar://problem/14502050>
Reviewed by Darin Adler.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::scaledSnapshotWithOptions):
WebFrame::coreFrame() can be null (if the Frame is already torn down),
so we should check it.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (153486 => 153487)
--- trunk/Source/WebKit2/ChangeLog 2013-07-30 19:38:47 UTC (rev 153486)
+++ trunk/Source/WebKit2/ChangeLog 2013-07-30 19:42:31 UTC (rev 153487)
@@ -1,5 +1,18 @@
2013-07-30 Tim Horton <[email protected]>
+ Null deref under WebPage::scaledSnapshotWithOptions
+ https://bugs.webkit.org/show_bug.cgi?id=119243
+ <rdar://problem/14502050>
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::scaledSnapshotWithOptions):
+ WebFrame::coreFrame() can be null (if the Frame is already torn down),
+ so we should check it.
+
+2013-07-30 Tim Horton <[email protected]>
+
Null deref under PluginView::handlesPageScaleFactor()
https://bugs.webkit.org/show_bug.cgi?id=119231
<rdar://problem/14440207>
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (153486 => 153487)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-30 19:38:47 UTC (rev 153486)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-30 19:42:31 UTC (rev 153487)
@@ -1500,7 +1500,11 @@
PassRefPtr<WebImage> WebPage::scaledSnapshotWithOptions(const IntRect& rect, double scaleFactor, SnapshotOptions options)
{
- FrameView* frameView = m_mainFrame->coreFrame()->view();
+ Frame* coreFrame = m_mainFrame->coreFrame();
+ if (!coreFrame)
+ return 0;
+
+ FrameView* frameView = coreFrame->view();
if (!frameView)
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
