<!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>[204941] trunk/Source</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/204941">204941</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-24 16:26:20 -0700 (Wed, 24 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>FocusController multiple dereferenced NULL pointers
https://bugs.webkit.org/show_bug.cgi?id=160808
Patch by Jonathan Bedard <jbedard@apple.com> on 2016-08-24
Reviewed by Darin Adler.
Source/WebCore:
No new tests needed, fix does not change functionality.
This change fixes a number of NULL pointer dereferences which occur in FocusController.
* page/FocusController.cpp:
(WebCore::isFocusableElementOrScopeOwner): Changed KeyboardEvent reference to pointer.
(WebCore::isNonFocusableScopeOwner): Ditto.
(WebCore::isFocusableScopeOwner): Ditto.
(WebCore::shadowAdjustedTabIndex): Ditto.
(WebCore::FocusController::findFocusableElementAcrossFocusScope): Pass pointer instead of reference to KeyboardEvent.
(WebCore::FocusController::nextFocusableElementWithinScope): Ditto.
(WebCore::FocusController::previousFocusableElementWithinScope): Ditto.
(WebCore::FocusController::findElementWithExactTabIndex): Ditto.
(WebCore::nextElementWithGreaterTabIndex): Ditto.
(WebCore::previousElementWithLowerTabIndex): Ditto.
(WebCore::FocusController::nextFocusableElementOrScopeOwner): Ditto.
(WebCore::FocusController::previousFocusableElementOrScopeOwner): Ditto.
(WebCore::relinquishesEditingFocus): Ditto.
Source/WebKit2:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setInitialFocus): Should use nullptr, not 0 to initialize NULL pointer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFocusControllercpp">trunk/Source/WebCore/page/FocusController.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204940 => 204941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-24 23:21:14 UTC (rev 204940)
+++ trunk/Source/WebCore/ChangeLog 2016-08-24 23:26:20 UTC (rev 204941)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-08-24 Jonathan Bedard <jbedard@apple.com>
+
+ FocusController multiple dereferenced NULL pointers
+ https://bugs.webkit.org/show_bug.cgi?id=160808
+
+ Reviewed by Darin Adler.
+
+ No new tests needed, fix does not change functionality.
+
+ This change fixes a number of NULL pointer dereferences which occur in FocusController.
+
+ * page/FocusController.cpp:
+ (WebCore::isFocusableElementOrScopeOwner): Changed KeyboardEvent reference to pointer.
+ (WebCore::isNonFocusableScopeOwner): Ditto.
+ (WebCore::isFocusableScopeOwner): Ditto.
+ (WebCore::shadowAdjustedTabIndex): Ditto.
+
+ (WebCore::FocusController::findFocusableElementAcrossFocusScope): Pass pointer instead of reference to KeyboardEvent.
+ (WebCore::FocusController::nextFocusableElementWithinScope): Ditto.
+ (WebCore::FocusController::previousFocusableElementWithinScope): Ditto.
+ (WebCore::FocusController::findElementWithExactTabIndex): Ditto.
+ (WebCore::nextElementWithGreaterTabIndex): Ditto.
+ (WebCore::previousElementWithLowerTabIndex): Ditto.
+ (WebCore::FocusController::nextFocusableElementOrScopeOwner): Ditto.
+ (WebCore::FocusController::previousFocusableElementOrScopeOwner): Ditto.
+ (WebCore::relinquishesEditingFocus): Ditto.
+
</ins><span class="cx"> 2016-08-24 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: VoiceOver on iOS ignores aria-checked on menuitemradio and menuitemcheckbox
</span></span></pre></div>
<a id="trunkSourceWebCorepageFocusControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FocusController.cpp (204940 => 204941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FocusController.cpp 2016-08-24 23:21:14 UTC (rev 204940)
+++ trunk/Source/WebCore/page/FocusController.cpp 2016-08-24 23:26:20 UTC (rev 204941)
</span><span class="lines">@@ -289,22 +289,22 @@
</span><span class="cx"> document->focusedElement()->dispatchFocusEvent(nullptr, FocusDirectionNone);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isFocusableElementOrScopeOwner(Element& element, KeyboardEvent& event)
</del><ins>+static inline bool isFocusableElementOrScopeOwner(Element& element, KeyboardEvent* event)
</ins><span class="cx"> {
</span><del>- return element.isKeyboardFocusable(&event) || isFocusScopeOwner(element);
</del><ins>+ return element.isKeyboardFocusable(event) || isFocusScopeOwner(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isNonFocusableScopeOwner(Element& element, KeyboardEvent& event)
</del><ins>+static inline bool isNonFocusableScopeOwner(Element& element, KeyboardEvent* event)
</ins><span class="cx"> {
</span><del>- return !element.isKeyboardFocusable(&event) && isFocusScopeOwner(element);
</del><ins>+ return !element.isKeyboardFocusable(event) && isFocusScopeOwner(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool isFocusableScopeOwner(Element& element, KeyboardEvent& event)
</del><ins>+static inline bool isFocusableScopeOwner(Element& element, KeyboardEvent* event)
</ins><span class="cx"> {
</span><del>- return element.isKeyboardFocusable(&event) && isFocusScopeOwner(element);
</del><ins>+ return element.isKeyboardFocusable(event) && isFocusScopeOwner(element);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline int shadowAdjustedTabIndex(Element& element, KeyboardEvent& event)
</del><ins>+static inline int shadowAdjustedTabIndex(Element& element, KeyboardEvent* event)
</ins><span class="cx"> {
</span><span class="cx"> if (isNonFocusableScopeOwner(element, event)) {
</span><span class="cx"> if (!element.tabIndexSetExplicitly())
</span><span class="lines">@@ -504,9 +504,9 @@
</span><span class="cx">
</span><span class="cx"> Element* FocusController::findFocusableElementAcrossFocusScope(FocusDirection direction, const FocusNavigationScope& scope, Node* currentNode, KeyboardEvent* event)
</span><span class="cx"> {
</span><del>- ASSERT(!is<Element>(currentNode) || !isNonFocusableScopeOwner(downcast<Element>(*currentNode), *event));
</del><ins>+ ASSERT(!is<Element>(currentNode) || !isNonFocusableScopeOwner(downcast<Element>(*currentNode), event));
</ins><span class="cx">
</span><del>- if (currentNode && direction == FocusDirectionForward && is<Element>(currentNode) && isFocusableScopeOwner(downcast<Element>(*currentNode), *event)) {
</del><ins>+ if (currentNode && direction == FocusDirectionForward && is<Element>(currentNode) && isFocusableScopeOwner(downcast<Element>(*currentNode), event)) {
</ins><span class="cx"> if (Element* candidateInInnerScope = findFocusableElementWithinScope(direction, FocusNavigationScope::scopeOwnedByScopeOwner(downcast<Element>(*currentNode)), 0, event))
</span><span class="cx"> return candidateInInnerScope;
</span><span class="cx"> }
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> // If there's no focusable node to advance to, move up the focus scopes until we find one.
</span><span class="cx"> Element* owner = scope.owner();
</span><span class="cx"> while (owner) {
</span><del>- if (direction == FocusDirectionBackward && isFocusableScopeOwner(*owner, *event))
</del><ins>+ if (direction == FocusDirectionBackward && isFocusableScopeOwner(*owner, event))
</ins><span class="cx"> return findFocusableElementDescendingDownIntoFrameDocument(direction, owner, event);
</span><span class="cx">
</span><span class="cx"> auto outerScope = FocusNavigationScope::scopeOf(*owner);
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> Element* found = nextFocusableElementOrScopeOwner(scope, start, event);
</span><span class="cx"> if (!found)
</span><span class="cx"> return nullptr;
</span><del>- if (isNonFocusableScopeOwner(*found, *event)) {
</del><ins>+ if (isNonFocusableScopeOwner(*found, event)) {
</ins><span class="cx"> if (Element* foundInInnerFocusScope = nextFocusableElementWithinScope(FocusNavigationScope::scopeOwnedByScopeOwner(*found), 0, event))
</span><span class="cx"> return foundInInnerFocusScope;
</span><span class="cx"> return nextFocusableElementWithinScope(scope, found, event);
</span><span class="lines">@@ -555,13 +555,13 @@
</span><span class="cx"> Element* found = previousFocusableElementOrScopeOwner(scope, start, event);
</span><span class="cx"> if (!found)
</span><span class="cx"> return nullptr;
</span><del>- if (isFocusableScopeOwner(*found, *event)) {
</del><ins>+ if (isFocusableScopeOwner(*found, event)) {
</ins><span class="cx"> // Search an inner focusable element in the shadow tree from the end.
</span><span class="cx"> if (Element* foundInInnerFocusScope = previousFocusableElementWithinScope(FocusNavigationScope::scopeOwnedByScopeOwner(*found), 0, event))
</span><span class="cx"> return foundInInnerFocusScope;
</span><span class="cx"> return found;
</span><span class="cx"> }
</span><del>- if (isNonFocusableScopeOwner(*found, *event)) {
</del><ins>+ if (isNonFocusableScopeOwner(*found, event)) {
</ins><span class="cx"> if (Element* foundInInnerFocusScope = previousFocusableElementWithinScope(FocusNavigationScope::scopeOwnedByScopeOwner(*found), 0, event))
</span><span class="cx"> return foundInInnerFocusScope;
</span><span class="cx"> return previousFocusableElementWithinScope(scope, found, event);
</span><span class="lines">@@ -583,13 +583,13 @@
</span><span class="cx"> if (!is<Element>(*node))
</span><span class="cx"> continue;
</span><span class="cx"> Element& element = downcast<Element>(*node);
</span><del>- if (isFocusableElementOrScopeOwner(element, *event) && shadowAdjustedTabIndex(element, *event) == tabIndex)
</del><ins>+ if (isFocusableElementOrScopeOwner(element, event) && shadowAdjustedTabIndex(element, event) == tabIndex)
</ins><span class="cx"> return &element;
</span><span class="cx"> }
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Element* nextElementWithGreaterTabIndex(const FocusNavigationScope& scope, int tabIndex, KeyboardEvent& event)
</del><ins>+static Element* nextElementWithGreaterTabIndex(const FocusNavigationScope& scope, int tabIndex, KeyboardEvent* event)
</ins><span class="cx"> {
</span><span class="cx"> // Search is inclusive of start
</span><span class="cx"> int winningTabIndex = std::numeric_limits<int>::max();
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx"> return winner;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Element* previousElementWithLowerTabIndex(const FocusNavigationScope& scope, Node* start, int tabIndex, KeyboardEvent& event)
</del><ins>+static Element* previousElementWithLowerTabIndex(const FocusNavigationScope& scope, Node* start, int tabIndex, KeyboardEvent* event)
</ins><span class="cx"> {
</span><span class="cx"> // Search is inclusive of start
</span><span class="cx"> int winningTabIndex = 0;
</span><span class="lines">@@ -644,7 +644,7 @@
</span><span class="cx"> {
</span><span class="cx"> int startTabIndex = 0;
</span><span class="cx"> if (start && is<Element>(*start))
</span><del>- startTabIndex = shadowAdjustedTabIndex(downcast<Element>(*start), *event);
</del><ins>+ startTabIndex = shadowAdjustedTabIndex(downcast<Element>(*start), event);
</ins><span class="cx">
</span><span class="cx"> if (start) {
</span><span class="cx"> // If a node is excluded from the normal tabbing cycle, the next focusable node is determined by tree order
</span><span class="lines">@@ -653,7 +653,7 @@
</span><span class="cx"> if (!is<Element>(*node))
</span><span class="cx"> continue;
</span><span class="cx"> Element& element = downcast<Element>(*node);
</span><del>- if (isFocusableElementOrScopeOwner(element, *event) && shadowAdjustedTabIndex(element, *event) >= 0)
</del><ins>+ if (isFocusableElementOrScopeOwner(element, event) && shadowAdjustedTabIndex(element, event) >= 0)
</ins><span class="cx"> return &element;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> // Look for the first Element in the scope that:
</span><span class="cx"> // 1) has the lowest tabindex that is higher than start's tabindex (or 0, if start is null), and
</span><span class="cx"> // 2) comes first in the scope, if there's a tie.
</span><del>- if (Element* winner = nextElementWithGreaterTabIndex(scope, startTabIndex, *event))
</del><ins>+ if (Element* winner = nextElementWithGreaterTabIndex(scope, startTabIndex, event))
</ins><span class="cx"> return winner;
</span><span class="cx">
</span><span class="cx"> // There are no nodes with a tabindex greater than start's tabindex,
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx"> if (start) {
</span><span class="cx"> startingNode = scope.previousInScope(start);
</span><span class="cx"> if (is<Element>(*start))
</span><del>- startingTabIndex = shadowAdjustedTabIndex(downcast<Element>(*start), *event);
</del><ins>+ startingTabIndex = shadowAdjustedTabIndex(downcast<Element>(*start), event);
</ins><span class="cx"> } else
</span><span class="cx"> startingNode = last;
</span><span class="cx">
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> if (!is<Element>(*node))
</span><span class="cx"> continue;
</span><span class="cx"> Element& element = downcast<Element>(*node);
</span><del>- if (isFocusableElementOrScopeOwner(element, *event) && shadowAdjustedTabIndex(element, *event) >= 0)
</del><ins>+ if (isFocusableElementOrScopeOwner(element, event) && shadowAdjustedTabIndex(element, event) >= 0)
</ins><span class="cx"> return &element;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -713,7 +713,7 @@
</span><span class="cx"> // 1) has the highest non-zero tabindex (that is less than start's tabindex), and
</span><span class="cx"> // 2) comes last in the scope, if there's a tie.
</span><span class="cx"> startingTabIndex = (start && startingTabIndex) ? startingTabIndex : std::numeric_limits<int>::max();
</span><del>- return previousElementWithLowerTabIndex(scope, last, startingTabIndex, *event);
</del><ins>+ return previousElementWithLowerTabIndex(scope, last, startingTabIndex, event);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool relinquishesEditingFocus(Node *node)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204940 => 204941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-24 23:21:14 UTC (rev 204940)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-24 23:26:20 UTC (rev 204941)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-24 Jonathan Bedard <jbedard@apple.com>
+
+ FocusController multiple dereferenced NULL pointers
+ https://bugs.webkit.org/show_bug.cgi?id=160808
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::setInitialFocus): Should use nullptr, not 0 to initialize NULL pointer.
+
</ins><span class="cx"> 2016-08-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add enum traits and use them in the IPC::Decoder
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (204940 => 204941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-08-24 23:21:14 UTC (rev 204940)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-08-24 23:26:20 UTC (rev 204941)
</span><span class="lines">@@ -2519,7 +2519,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->focusController().setInitialFocus(forward ? FocusDirectionForward : FocusDirectionBackward, 0);
</del><ins>+ m_page->focusController().setInitialFocus(forward ? FocusDirectionForward : FocusDirectionBackward, nullptr);
</ins><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>