<!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>[186751] branches/safari-601.1-branch/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/186751">186751</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-07-12 23:45:40 -0700 (Sun, 12 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/186683">r186683</a>. rdar://problem/21371589</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreloaderFrameLoadercpp">branches/safari-601.1-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreloaderHistoryControllercpp">branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreloaderHistoryControllerh">branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186750 => 186751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-13 06:44:22 UTC (rev 186750)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-13 06:45:40 UTC (rev 186751)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2015-07-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186683.
+
+ 2015-07-10 Brady Eidson <beidson@apple.com>
+
+ Crash in HistoryController::updateForCommit dereferencing a null HistoryItem.
+ <rdar://problem/21371589> and https://bugs.webkit.org/show_bug.cgi?id=146842
+
+ Reviewed by Chris Dumez.
+
+ No new tests (Unknown how to reproduce).
+
+ This patch basically rolls back part of http://trac.webkit.org/changeset/179472.
+
+ r179472 changed HistoryController::setCurrentItem() to take a reference instead of a pointer.
+ Unfortunately, we sometimes call setCurrentItem(nullptr).
+
+ We'd like to *not* do that, and there are assertions in place to try to catch when we do,
+ but in the meantime it is not valid to dereference nullptr.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::loadSameDocumentItem):
+
+ * loader/HistoryController.cpp:
+ (WebCore::HistoryController::updateForCommit):
+ (WebCore::HistoryController::recursiveUpdateForCommit):
+ (WebCore::HistoryController::recursiveUpdateForSameDocumentNavigation):
+ (WebCore::HistoryController::setCurrentItem): Take a ptr instead of a ref.
+ (WebCore::HistoryController::createItem):
+ * loader/HistoryController.h:
+
+2015-07-12 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r186718.
</span><span class="cx">
</span><span class="cx"> 2015-07-11 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/loader/FrameLoader.cpp (186750 => 186751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/loader/FrameLoader.cpp 2015-07-13 06:44:22 UTC (rev 186750)
+++ branches/safari-601.1-branch/Source/WebCore/loader/FrameLoader.cpp 2015-07-13 06:45:40 UTC (rev 186751)
</span><span class="lines">@@ -3181,7 +3181,7 @@
</span><span class="cx"> if (FrameView* view = m_frame.view())
</span><span class="cx"> view->setWasScrolledByUser(false);
</span><span class="cx">
</span><del>- history().setCurrentItem(item);
</del><ins>+ history().setCurrentItem(&item);
</ins><span class="cx">
</span><span class="cx"> // loadInSameDocument() actually changes the URL and notifies load delegates of a "fake" load
</span><span class="cx"> loadInSameDocument(item.url(), item.stateObject(), false);
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreloaderHistoryControllercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp (186750 => 186751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp 2015-07-13 06:44:22 UTC (rev 186750)
+++ branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.cpp 2015-07-13 06:45:40 UTC (rev 186751)
</span><span class="lines">@@ -470,8 +470,13 @@
</span><span class="cx"> // the provisional item for restoring state.
</span><span class="cx"> // Note previousItem must be set before we close the URL, which will
</span><span class="cx"> // happen when the data source is made non-provisional below
</span><ins>+
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=146842
+ // We should always have a provisional item when committing, but we sometimes don't.
+ // Not having one leads to us not having a m_currentItem later, which is also a terrible known issue.
+ // We should get to the bottom of this.
</ins><span class="cx"> ASSERT(m_provisionalItem);
</span><del>- setCurrentItem(*m_provisionalItem);
</del><ins>+ setCurrentItem(m_provisionalItem.get());
</ins><span class="cx"> m_provisionalItem = nullptr;
</span><span class="cx">
</span><span class="cx"> // Tell all other frames in the tree to commit their provisional items and
</span><span class="lines">@@ -512,7 +517,7 @@
</span><span class="cx"> view->setWasScrolledByUser(false);
</span><span class="cx">
</span><span class="cx"> // Now commit the provisional item
</span><del>- setCurrentItem(*m_provisionalItem);
</del><ins>+ setCurrentItem(m_provisionalItem.get());
</ins><span class="cx"> m_provisionalItem = nullptr;
</span><span class="cx">
</span><span class="cx"> // Restore form state (works from currentItem)
</span><span class="lines">@@ -561,7 +566,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Commit the provisional item.
</span><del>- setCurrentItem(*m_provisionalItem);
</del><ins>+ setCurrentItem(m_provisionalItem.get());
</ins><span class="cx"> m_provisionalItem = nullptr;
</span><span class="cx">
</span><span class="cx"> // Iterate over the rest of the tree.
</span><span class="lines">@@ -577,11 +582,11 @@
</span><span class="cx"> m_frameLoadComplete = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void HistoryController::setCurrentItem(HistoryItem& item)
</del><ins>+void HistoryController::setCurrentItem(HistoryItem* item)
</ins><span class="cx"> {
</span><span class="cx"> m_frameLoadComplete = false;
</span><span class="cx"> m_previousItem = m_currentItem;
</span><del>- m_currentItem = &item;
</del><ins>+ m_currentItem = item;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HistoryController::setCurrentItemTitle(const StringWithDirection& title)
</span><span class="lines">@@ -664,7 +669,7 @@
</span><span class="cx"> initializeItem(item);
</span><span class="cx">
</span><span class="cx"> // Set the item for which we will save document state
</span><del>- setCurrentItem(item);
</del><ins>+ setCurrentItem(item.ptr());
</ins><span class="cx">
</span><span class="cx"> return item;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreloaderHistoryControllerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.h (186750 => 186751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.h 2015-07-13 06:44:22 UTC (rev 186750)
+++ branches/safari-601.1-branch/Source/WebCore/loader/HistoryController.h 2015-07-13 06:45:40 UTC (rev 186751)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> void updateForFrameLoadCompleted();
</span><span class="cx">
</span><span class="cx"> HistoryItem* currentItem() const { return m_currentItem.get(); }
</span><del>- void setCurrentItem(HistoryItem&);
</del><ins>+ void setCurrentItem(HistoryItem*);
</ins><span class="cx"> void setCurrentItemTitle(const StringWithDirection&);
</span><span class="cx"> bool currentItemShouldBeReplaced() const;
</span><span class="cx"> WEBCORE_EXPORT void replaceCurrentItem(HistoryItem*);
</span></span></pre>
</div>
</div>
</body>
</html>