<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167851] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167851">167851</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-26 21:09:45 -0700 (Sat, 26 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Frame and page lifetime fixes in WebCore::createWindow
https://bugs.webkit.org/show_bug.cgi?id=132089
Reviewed by Sam Weinig.
Speculative fix because I was unable to reproduce the crash that was
reported with the test case attached to this bug.
* loader/FrameLoader.cpp:
(WebCore::createWindow): Changed code to remove the assumption that calls
out will not destroy the page or frame. Use RefPtr for the frame, and
added early exits if frame->page() becomes null at any point before we
use a page pointer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderSubframeLoadercpp">trunk/Source/WebCore/loader/SubframeLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167850 => 167851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-27 02:48:19 UTC (rev 167850)
+++ trunk/Source/WebCore/ChangeLog 2014-04-27 04:09:45 UTC (rev 167851)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-04-26 Darin Adler <darin@apple.com>
+
+ Frame and page lifetime fixes in WebCore::createWindow
+ https://bugs.webkit.org/show_bug.cgi?id=132089
+
+ Reviewed by Sam Weinig.
+
+ Speculative fix because I was unable to reproduce the crash that was
+ reported with the test case attached to this bug.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::createWindow): Changed code to remove the assumption that calls
+ out will not destroy the page or frame. Use RefPtr for the frame, and
+ added early exits if frame->page() becomes null at any point before we
+ use a page pointer.
+
</ins><span class="cx"> 2014-04-26 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Local files should not be allowed to read pasteboard data during drag
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (167850 => 167851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-04-27 02:48:19 UTC (rev 167850)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-04-27 04:09:45 UTC (rev 167851)
</span><span class="lines">@@ -3426,14 +3426,15 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!features.dialog || request.frameName().isEmpty());
</span><span class="cx">
</span><ins>+ created = false;
+
</ins><span class="cx"> if (!request.frameName().isEmpty() && request.frameName() != "_blank") {
</span><del>- if (Frame* frame = lookupFrame->loader().findFrameForNavigation(request.frameName(), openerFrame->document())) {
</del><ins>+ if (RefPtr<Frame> frame = lookupFrame->loader().findFrameForNavigation(request.frameName(), openerFrame->document())) {
</ins><span class="cx"> if (request.frameName() != "_self") {
</span><span class="cx"> if (Page* page = frame->page())
</span><span class="cx"> page->chrome().focus();
</span><span class="cx"> }
</span><del>- created = false;
- return frame;
</del><ins>+ return frame.release();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3441,7 +3442,7 @@
</span><span class="cx"> if (isDocumentSandboxed(openerFrame, SandboxPopups)) {
</span><span class="cx"> // FIXME: This message should be moved off the console once a solution to https://bugs.webkit.org/show_bug.cgi?id=103274 exists.
</span><span class="cx"> openerFrame->document()->addConsoleMessage(MessageSource::Security, MessageLevel::Error, "Blocked opening '" + request.resourceRequest().url().stringCenterEllipsizedToLength() + "' in a new window because the request was made in a sandboxed frame whose 'allow-popups' permission is not set.");
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: Setting the referrer should be the caller's responsibility.
</span><span class="lines">@@ -3453,29 +3454,42 @@
</span><span class="cx">
</span><span class="cx"> Page* oldPage = openerFrame->page();
</span><span class="cx"> if (!oldPage)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- NavigationAction action(requestWithReferrer.resourceRequest());
- Page* page = oldPage->chrome().createWindow(openerFrame, requestWithReferrer, features, action);
</del><ins>+ Page* page = oldPage->chrome().createWindow(openerFrame, requestWithReferrer, features, NavigationAction(requestWithReferrer.resourceRequest()));
</ins><span class="cx"> if (!page)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- page->mainFrame().loader().forceSandboxFlags(openerFrame->document()->sandboxFlags());
</del><ins>+ RefPtr<Frame> frame = &page->mainFrame();
</ins><span class="cx">
</span><ins>+ frame->loader().forceSandboxFlags(openerFrame->document()->sandboxFlags());
+
</ins><span class="cx"> if (request.frameName() != "_blank")
</span><del>- page->mainFrame().tree().setName(request.frameName());
</del><ins>+ frame->tree().setName(request.frameName());
</ins><span class="cx">
</span><span class="cx"> page->chrome().setToolbarsVisible(features.toolBarVisible || features.locationBarVisible);
</span><ins>+
+ if (!frame->page())
+ return nullptr;
</ins><span class="cx"> page->chrome().setStatusbarVisible(features.statusBarVisible);
</span><ins>+
+ if (!frame->page())
+ return nullptr;
</ins><span class="cx"> page->chrome().setScrollbarsVisible(features.scrollbarsVisible);
</span><ins>+
+ if (!frame->page())
+ return nullptr;
</ins><span class="cx"> page->chrome().setMenubarVisible(features.menuBarVisible);
</span><ins>+
+ if (!frame->page())
+ return nullptr;
</ins><span class="cx"> page->chrome().setResizable(features.resizable);
</span><span class="cx">
</span><span class="cx"> // 'x' and 'y' specify the location of the window, while 'width' and 'height'
</span><span class="cx"> // specify the size of the viewport. We can only resize the window, so adjust
</span><span class="cx"> // for the difference between the window size and the viewport size.
</span><span class="cx">
</span><del>-// FIXME: We should reconcile the initialization of viewport arguments between iOS and OpenSource.
</del><ins>+ // FIXME: We should reconcile the initialization of viewport arguments between iOS and non-IOS.
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> FloatSize viewportSize = page->chrome().pageRect().size();
</span><span class="cx"> FloatRect windowRect = page->chrome().windowRect();
</span><span class="lines">@@ -3492,6 +3506,8 @@
</span><span class="cx"> // Ensure non-NaN values, minimum size as well as being within valid screen area.
</span><span class="cx"> FloatRect newWindowRect = DOMWindow::adjustWindowRect(page, windowRect);
</span><span class="cx">
</span><ins>+ if (!frame->page())
+ return nullptr;
</ins><span class="cx"> page->chrome().setWindowRect(newWindowRect);
</span><span class="cx"> #else
</span><span class="cx"> // On iOS, width and height refer to the viewport dimensions.
</span><span class="lines">@@ -3501,13 +3517,15 @@
</span><span class="cx"> arguments.width = features.width;
</span><span class="cx"> if (features.heightSet && features.height)
</span><span class="cx"> arguments.height = features.height;
</span><del>- page->mainFrame().setViewportArguments(arguments);
</del><ins>+ frame->setViewportArguments(arguments);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (!frame->page())
+ return nullptr;
</ins><span class="cx"> page->chrome().show();
</span><span class="cx">
</span><span class="cx"> created = true;
</span><del>- return &page->mainFrame();
</del><ins>+ return frame.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubframeLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (167850 => 167851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-04-27 02:48:19 UTC (rev 167850)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2014-04-27 04:09:45 UTC (rev 167851)
</span><span class="lines">@@ -322,6 +322,9 @@
</span><span class="cx">
</span><span class="cx"> Frame* SubframeLoader::loadOrRedirectSubframe(HTMLFrameOwnerElement& ownerElement, const URL& url, const AtomicString& frameName, LockHistory lockHistory, LockBackForwardList lockBackForwardList)
</span><span class="cx"> {
</span><ins>+ if (!url.isValid())
+ return nullptr;
+
</ins><span class="cx"> Frame* frame = ownerElement.contentFrame();
</span><span class="cx"> if (frame)
</span><span class="cx"> frame->navigationScheduler().scheduleLocationChange(m_frame.document()->securityOrigin(), url.string(), m_frame.loader().outgoingReferrer(), lockHistory, lockBackForwardList);
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (167850 => 167851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-04-27 02:48:19 UTC (rev 167850)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-04-27 04:09:45 UTC (rev 167851)
</span><span class="lines">@@ -1891,19 +1891,20 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> URL completedURL = firstFrame->document()->completeURL(urlString);
</span><del>- if (completedURL.isNull())
</del><ins>+ if (!completedURL.isValid())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (isInsecureScriptAccess(activeWindow, completedURL))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ Frame* referrerFrame = activeDocument->frame();
+ if (!referrerFrame)
+ return;
+
</ins><span class="cx"> // We want a new history item if we are processing a user gesture.
</span><span class="cx"> LockHistory lockHistory = (locking != LockHistoryBasedOnGestureState || !ScriptController::processingUserGesture()) ? LockHistory::Yes : LockHistory::No;
</span><span class="cx"> LockBackForwardList lockBackForwardList = (locking != LockHistoryBasedOnGestureState) ? LockBackForwardList::Yes : LockBackForwardList::No;
</span><del>- m_frame->navigationScheduler().scheduleLocationChange(activeDocument->securityOrigin(),
- // FIXME: What if activeDocument()->frame() is 0?
- completedURL, activeDocument->frame()->loader().outgoingReferrer(),
- lockHistory, lockBackForwardList);
</del><ins>+ m_frame->navigationScheduler().scheduleLocationChange(activeDocument->securityOrigin(), completedURL, referrerFrame->loader().outgoingReferrer(), lockHistory, lockBackForwardList);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMWindow::printErrorMessage(const String& message)
</span><span class="lines">@@ -1988,7 +1989,7 @@
</span><span class="cx"> if (!completedURL.isEmpty() && !completedURL.isValid()) {
</span><span class="cx"> // Don't expose client code to invalid URLs.
</span><span class="cx"> activeWindow.printErrorMessage("Unable to open a window with invalid URL '" + completedURL.string() + "'.\n");
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For whatever reason, Firefox uses the first frame to determine the outgoingReferrer. We replicate that behavior here.
</span><span class="lines">@@ -2003,7 +2004,7 @@
</span><span class="cx"> bool created;
</span><span class="cx"> RefPtr<Frame> newFrame = WebCore::createWindow(activeFrame, openerFrame, frameRequest, windowFeatures, created);
</span><span class="cx"> if (!newFrame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> newFrame->loader().setOpener(openerFrame);
</span><span class="cx"> newFrame->page()->setOpenedByDOM();
</span><span class="lines">@@ -2032,24 +2033,24 @@
</span><span class="cx"> DOMWindow& activeWindow, DOMWindow& firstWindow)
</span><span class="cx"> {
</span><span class="cx"> if (!isCurrentlyDisplayedInFrame())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> Document* activeDocument = activeWindow.document();
</span><span class="cx"> if (!activeDocument)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> Frame* firstFrame = firstWindow.frame();
</span><span class="cx"> if (!firstFrame)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!firstWindow.allowPopUp()) {
</span><span class="cx"> // Because FrameTree::find() returns true for empty strings, we must check for empty frame names.
</span><span class="cx"> // Otherwise, illegitimate window.open() calls with no name will pass right through the popup blocker.
</span><span class="cx"> if (frameName.isEmpty() || !m_frame->tree().find(frameName))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get the target frame for the special cases of _top and _parent.
</span><span class="cx"> // In those cases, we schedule a location change right now and return early.
</span><del>- Frame* targetFrame = 0;
</del><ins>+ Frame* targetFrame = nullptr;
</ins><span class="cx"> if (frameName == "_top")
</span><span class="cx"> targetFrame = &m_frame->tree().top();
</span><span class="cx"> else if (frameName == "_parent") {
</span><span class="lines">@@ -2060,9 +2061,11 @@
</span><span class="cx"> }
</span><span class="cx"> if (targetFrame) {
</span><span class="cx"> if (!activeDocument->canNavigate(targetFrame))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> URL completedURL = firstFrame->document()->completeURL(urlString);
</span><ins>+ if (!completedURL.isValid())
+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> if (targetFrame->document()->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
</span><span class="cx"> return targetFrame->document()->domWindow();
</span><span class="lines">@@ -2080,7 +2083,7 @@
</span><span class="cx">
</span><span class="cx"> WindowFeatures windowFeatures(windowFeaturesString);
</span><span class="cx"> RefPtr<Frame> result = createWindow(urlString, frameName, windowFeatures, activeWindow, firstFrame, m_frame);
</span><del>- return result ? result->document()->domWindow() : 0;
</del><ins>+ return result ? result->document()->domWindow() : nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DOMWindow::showModalDialog(const String& urlString, const String& dialogFeaturesString, DOMWindow& activeWindow, DOMWindow& firstWindow, std::function<void (DOMWindow&)> prepareDialogFunction)
</span></span></pre>
</div>
</div>
</body>
</html>