<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[20700] branches/Safari-522/WebCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20700">20700</a></dd>
<dt>Author</dt> <dd>sfalken</dd>
<dt>Date</dt> <dd>2007-04-04 10:12:39 -0700 (Wed, 04 Apr 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged fix from r20669</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesSafari522WebCoreChangeLog">branches/Safari-522/WebCore/ChangeLog</a></li>
<li><a href="#branchesSafari522WebCoreeditingEditorcpp">branches/Safari-522/WebCore/editing/Editor.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesSafari522WebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebCore/ChangeLog (20699 => 20700)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebCore/ChangeLog        2007-04-04 16:47:10 UTC (rev 20699)
+++ branches/Safari-522/WebCore/ChangeLog        2007-04-04 17:12:39 UTC (rev 20700)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2007-04-02  Ada Chan  &lt;adachan@apple.com&gt;
+
+        Reviewed by Adele.
+
+        &lt;rdar://5105331&gt; Missing null check in Editor::execCommand
+        Added null check.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::execCommand):
+
</ins><span class="cx"> 2007-03-28  Adele Peterson  &lt;adele@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Kevin M.
</span></span></pre></div>
<a id="branchesSafari522WebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: branches/Safari-522/WebCore/editing/Editor.cpp (20699 => 20700)</h4>
<pre class="diff"><span>
<span class="info">--- branches/Safari-522/WebCore/editing/Editor.cpp        2007-04-04 16:47:10 UTC (rev 20699)
+++ branches/Safari-522/WebCore/editing/Editor.cpp        2007-04-04 17:12:39 UTC (rev 20700)
</span><span class="lines">@@ -1286,6 +1286,9 @@
</span><span class="cx"> 
</span><span class="cx"> bool Editor::execCommand(const AtomicString&amp; command, Event* triggeringEvent)
</span><span class="cx"> {
</span><ins>+    if (!m_frame-&gt;document())
+        return false;
+
</ins><span class="cx">     static CommandMap* commandMap;
</span><span class="cx">     if (!commandMap)
</span><span class="cx">         commandMap = createCommandMap();
</span></span></pre>
</div>
</div>

</body>
</html>