Title: [153538] branches/safari-537-branch/Source/WebKit2
- Revision
- 153538
- Author
- [email protected]
- Date
- 2013-07-31 12:51:49 -0700 (Wed, 31 Jul 2013)
Log Message
Merged r153487. <rdar://problem/14502050>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebKit2/ChangeLog (153537 => 153538)
--- branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-31 19:32:22 UTC (rev 153537)
+++ branches/safari-537-branch/Source/WebKit2/ChangeLog 2013-07-31 19:51:49 UTC (rev 153538)
@@ -1,3 +1,20 @@
+2013-07-31 Lucas Forschler <[email protected]>
+
+ Merge r153487
+
+ 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 Lucas Forschler <[email protected]>
Merge r153486
Modified: branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (153537 => 153538)
--- branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-31 19:32:22 UTC (rev 153537)
+++ branches/safari-537-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-07-31 19:51:49 UTC (rev 153538)
@@ -1515,7 +1515,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
