<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[28894] branches/Safari-3-branch/WebCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28894">28894</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2007-12-20 12:05:27 -0800 (Thu, 20 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge r28057.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSafari3branchWebCoreChangeLog">branches/Safari-3-branch/WebCore/ChangeLog</a></li>
<li><a href="#branchesSafari3branchWebCorepageFrameTreecpp">branches/Safari-3-branch/WebCore/page/FrameTree.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSafari3branchWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-branch/WebCore/ChangeLog (28893 => 28894)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-branch/WebCore/ChangeLog        2007-12-20 19:40:41 UTC (rev 28893)
+++ branches/Safari-3-branch/WebCore/ChangeLog        2007-12-20 20:05:27 UTC (rev 28894)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2007-12-20  Mark Rowe  &lt;mrowe@apple.com&gt;
+
+        Merge r28057 to Safari-3-branch.
+
+    2007-11-26  Sam Weinig  &lt;sam@webkit.org&gt;
+
+        Fix potential null-dereference.
+
+        Reviewed by Adam Roben.
+
+        * page/FrameTree.cpp:
+        (WebCore::FrameTree::isDescendantOf):
+
</ins><span class="cx"> 2007-12-01  Mark Rowe  &lt;mrowe@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r26782 to Safari-3-branch.
</span></span></pre></div>
<a id="branchesSafari3branchWebCorepageFrameTreecpp"></a>
<div class="modfile"><h4>Modified: branches/Safari-3-branch/WebCore/page/FrameTree.cpp (28893 => 28894)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-3-branch/WebCore/page/FrameTree.cpp        2007-12-20 19:40:41 UTC (rev 28893)
+++ branches/Safari-3-branch/WebCore/page/FrameTree.cpp        2007-12-20 20:05:27 UTC (rev 28894)
</span><span class="lines">@@ -211,6 +211,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool FrameTree::isDescendantOf(const Frame* ancestor) const
</span><span class="cx"> {
</span><ins>+    if (!ancestor)
+        return false;
+
</ins><span class="cx">     if (m_thisFrame-&gt;page() != ancestor-&gt;page())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>