<!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>[199910] 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/199910">199910</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-04-22 14:32:25 -0700 (Fri, 22 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash under WebCore::DataDetection::detectContentInRange()
https://bugs.webkit.org/show_bug.cgi?id=156880
<rdar://problem/25622631>
Reviewed by Darin Adler.
We would sometimes crash under WebCore::DataDetection::detectContentInRange()
when dereferencing a null parentNode pointer. This patch adds a null check
for parentNode in the for() loop. It also does some clean up and optimization
since I was passing by.
* editing/cocoa/DataDetection.mm:
(WebCore::DataDetection::detectContentInRange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaDataDetectionmm">trunk/Source/WebCore/editing/cocoa/DataDetection.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199909 => 199910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-22 21:32:02 UTC (rev 199909)
+++ trunk/Source/WebCore/ChangeLog 2016-04-22 21:32:25 UTC (rev 199910)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-22 Chris Dumez <cdumez@apple.com>
+
+ Crash under WebCore::DataDetection::detectContentInRange()
+ https://bugs.webkit.org/show_bug.cgi?id=156880
+ <rdar://problem/25622631>
+
+ Reviewed by Darin Adler.
+
+ We would sometimes crash under WebCore::DataDetection::detectContentInRange()
+ when dereferencing a null parentNode pointer. This patch adds a null check
+ for parentNode in the for() loop. It also does some clean up and optimization
+ since I was passing by.
+
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::DataDetection::detectContentInRange):
+
</ins><span class="cx"> 2016-04-22 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> buildObjectForEventListener should not call into JSC with a null ExecState
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (199909 => 199910)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-04-22 21:32:02 UTC (rev 199909)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2016-04-22 21:32:25 UTC (rev 199910)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import "NodeTraversal.h"
</span><span class="cx"> #import "Range.h"
</span><span class="cx"> #import "RenderObject.h"
</span><ins>+#import "StyleProperties.h"
</ins><span class="cx"> #import "Text.h"
</span><span class="cx"> #import "TextIterator.h"
</span><span class="cx"> #import "VisiblePosition.h"
</span><span class="lines">@@ -516,10 +517,8 @@
</span><span class="cx"> for (auto& result : allResults) {
</span><span class="cx"> DDQueryRange queryRange = softLink_DataDetectorsCore_DDResultGetQueryRangeForURLification(result.get());
</span><span class="cx"> CFIndex iteratorTargetAdvanceCount = (CFIndex)softLink_DataDetectorsCore_DDScanQueryGetFragmentMetaData(scanQuery.get(), queryRange.start.queryIndex);
</span><del>- while (iteratorCount < iteratorTargetAdvanceCount) {
</del><ins>+ for (; iteratorCount < iteratorTargetAdvanceCount; ++iteratorCount)
</ins><span class="cx"> iterator.advance();
</span><del>- iteratorCount++;
- }
</del><span class="cx">
</span><span class="cx"> Vector<RefPtr<Range>> fragmentRanges;
</span><span class="cx"> RefPtr<Range> currentRange = iterator.range();
</span><span class="lines">@@ -534,12 +533,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (fragmentIndex < queryRange.end.queryIndex) {
</span><del>- fragmentIndex++;
</del><ins>+ ++fragmentIndex;
</ins><span class="cx"> iteratorTargetAdvanceCount = (CFIndex)softLink_DataDetectorsCore_DDScanQueryGetFragmentMetaData(scanQuery.get(), fragmentIndex);
</span><del>- while (iteratorCount < iteratorTargetAdvanceCount) {
</del><ins>+ for (; iteratorCount < iteratorTargetAdvanceCount; ++iteratorCount)
</ins><span class="cx"> iterator.advance();
</span><del>- iteratorCount++;
- }
</del><ins>+
</ins><span class="cx"> currentRange = iterator.range();
</span><span class="cx"> RefPtr<Range> fragmentRange = (fragmentIndex == queryRange.end.queryIndex) ? Range::create(currentRange->ownerDocument(), &currentRange->startContainer(), currentRange->startOffset(), &currentRange->endContainer(), currentRange->startOffset() + queryRange.end.offset) : currentRange;
</span><span class="cx"> RefPtr<Range> previousRange = fragmentRanges.last();
</span><span class="lines">@@ -549,7 +547,7 @@
</span><span class="cx"> } else
</span><span class="cx"> fragmentRanges.append(fragmentRange);
</span><span class="cx"> }
</span><del>- allResultRanges.append(fragmentRanges);
</del><ins>+ allResultRanges.append(WTFMove(fragmentRanges));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CFTimeZoneRef tz = CFTimeZoneCopyDefault();
</span><span class="lines">@@ -564,37 +562,39 @@
</span><span class="cx"> // we are about to process a different text node.
</span><span class="cx"> resultCount = allResults.size();
</span><span class="cx">
</span><del>- for (CFIndex resultIndex = 0; resultIndex < resultCount; resultIndex++) {
</del><ins>+ for (CFIndex resultIndex = 0; resultIndex < resultCount; ++resultIndex) {
</ins><span class="cx"> DDResultRef coreResult = allResults[resultIndex].get();
</span><span class="cx"> DDQueryRange queryRange = softLink_DataDetectorsCore_DDResultGetQueryRangeForURLification(coreResult);
</span><del>- Vector<RefPtr<Range>> resultRanges = allResultRanges[resultIndex];
</del><ins>+ auto& resultRanges = allResultRanges[resultIndex];
</ins><span class="cx">
</span><span class="cx"> // Compare the query offsets to make sure we don't go backwards
</span><span class="cx"> if (queryOffsetCompare(lastModifiedQueryOffset, queryRange.start) >= 0)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (!resultRanges.size())
</del><ins>+ if (resultRanges.isEmpty())
</ins><span class="cx"> continue;
</span><del>-
- NSString *identifier = dataDetectorStringForPath(indexPaths[resultIndex].get());
- NSString *correspondingURL = constructURLStringForResult(coreResult, identifier, referenceDate, (NSTimeZone *)tz, types);
- bool didModifyDOM = false;
</del><span class="cx">
</span><span class="cx"> // Store the range boundaries as Position, because the DOM could change if we find
</span><span class="cx"> // old data detector link.
</span><span class="cx"> Vector<std::pair<Position, Position>> rangeBoundaries;
</span><ins>+ rangeBoundaries.reserveInitialCapacity(resultRanges.size());
</ins><span class="cx"> for (auto& range : resultRanges)
</span><del>- rangeBoundaries.append(std::make_pair(range->startPosition(), range->endPosition()));
</del><ins>+ rangeBoundaries.uncheckedAppend({ range->startPosition(), range->endPosition() });
</ins><span class="cx">
</span><ins>+ NSString *identifier = dataDetectorStringForPath(indexPaths[resultIndex].get());
+ NSString *correspondingURL = constructURLStringForResult(coreResult, identifier, referenceDate, (NSTimeZone *)tz, types);
+ bool didModifyDOM = false;
+
</ins><span class="cx"> if (!correspondingURL || searchForLinkRemovingExistingDDLinks(resultRanges.first()->startContainer(), resultRanges.last()->endContainer(), didModifyDOM))
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (didModifyDOM) {
</span><span class="cx"> // If the DOM was modified because some old links were removed,
</span><span class="cx"> // we need to recreate the ranges because they could no longer be valid.
</span><del>- resultRanges.clear();
</del><ins>+ ASSERT(resultRanges.size() == rangeBoundaries.size());
+ resultRanges.shrink(0); // Keep capacity as we are going to repopulate the Vector right away with the same number of items.
</ins><span class="cx"> for (auto& rangeBoundary : rangeBoundaries)
</span><del>- resultRanges.append(Range::create(*rangeBoundary.first.document(), rangeBoundary.first, rangeBoundary.second));
</del><ins>+ resultRanges.uncheckedAppend(Range::create(*rangeBoundary.first.document(), rangeBoundary.first, rangeBoundary.second));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> lastModifiedQueryOffset = queryRange.end;
</span><span class="lines">@@ -605,8 +605,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> for (auto& range : resultRanges) {
</span><del>- Node* parentNode = range->startContainer().parentNode();
- Text& currentTextNode = downcast<Text>(range->startContainer());
</del><ins>+ auto* parentNode = range->startContainer().parentNode();
+ if (!parentNode)
+ continue;
+
+ auto& currentTextNode = downcast<Text>(range->startContainer());
</ins><span class="cx"> Document& document = currentTextNode.document();
</span><span class="cx"> String textNodeData;
</span><span class="cx">
</span><span class="lines">@@ -615,40 +618,43 @@
</span><span class="cx"> lastTextNodeToUpdate->setData(lastNodeContent);
</span><span class="cx"> contentOffset = 0;
</span><span class="cx"> if (range->startOffset() > 0)
</span><del>- textNodeData = currentTextNode.substringData(0, range->startOffset(), ASSERT_NO_EXCEPTION);
</del><ins>+ textNodeData = currentTextNode.data().substring(0, range->startOffset());
</ins><span class="cx"> } else
</span><del>- textNodeData = currentTextNode.substringData(contentOffset, range->startOffset() - contentOffset, ASSERT_NO_EXCEPTION);
</del><ins>+ textNodeData = currentTextNode.data().substring(contentOffset, range->startOffset() - contentOffset);
</ins><span class="cx">
</span><span class="cx"> if (!textNodeData.isEmpty()) {
</span><del>- RefPtr<Node> newNode = Text::create(document, textNodeData);
- parentNode->insertBefore(newNode, &currentTextNode, ASSERT_NO_EXCEPTION);
</del><ins>+ parentNode->insertBefore(Text::create(document, textNodeData), &currentTextNode);
</ins><span class="cx"> contentOffset = range->startOffset();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Create the actual anchor node and insert it before the current node.
</span><del>- textNodeData = currentTextNode.substringData(range->startOffset(), range->endOffset() - range->startOffset(), ASSERT_NO_EXCEPTION);
- RefPtr<Node> newNode = Text::create(document, textNodeData);
- parentNode->insertBefore(newNode, &currentTextNode, ASSERT_NO_EXCEPTION);
</del><ins>+ textNodeData = currentTextNode.data().substring(range->startOffset(), range->endOffset() - range->startOffset());
+ Ref<Text> newTextNode = Text::create(document, textNodeData);
+ parentNode->insertBefore(newTextNode.copyRef(), &currentTextNode);
</ins><span class="cx">
</span><del>- RefPtr<HTMLAnchorElement> anchorElement = HTMLAnchorElement::create(document);
</del><ins>+ Ref<HTMLAnchorElement> anchorElement = HTMLAnchorElement::create(document);
</ins><span class="cx"> anchorElement->setHref(correspondingURL);
</span><span class="cx"> anchorElement->setDir("ltr");
</span><span class="cx"> if (shouldUseLightLinks)
</span><del>- anchorElement->setAttribute(HTMLNames::styleAttr, dataDetectorsLinkStyle);
- else {
- RefPtr<Attr> color = downcast<Element>(parentNode)->getAttributeNode("color");
- if (color)
- anchorElement->setAttribute(HTMLNames::styleAttr, color->style()->cssText());
</del><ins>+ anchorElement->setAttribute(styleAttr, dataDetectorsLinkStyle);
+ else if (is<StyledElement>(*parentNode)) {
+ if (auto* style = downcast<StyledElement>(*parentNode).presentationAttributeStyle()) {
+ String color = style->getPropertyValue(CSSPropertyColor);
+ if (!color.isEmpty())
+ anchorElement->setInlineStyleProperty(CSSPropertyColor, color);
+ }
</ins><span class="cx"> }
</span><del>- anchorElement->Node::appendChild(newNode, ASSERT_NO_EXCEPTION);
- parentNode->insertBefore(anchorElement, &currentTextNode, ASSERT_NO_EXCEPTION);
</del><ins>+ anchorElement->appendChild(WTFMove(newTextNode));
</ins><span class="cx"> // Add a special attribute to mark this URLification as the result of data detectors.
</span><span class="cx"> anchorElement->setAttribute(x_apple_data_detectorsAttr, "true");
</span><span class="cx"> anchorElement->setAttribute(x_apple_data_detectors_typeAttr, dataDetectorTypeForCategory(softLink_DataDetectorsCore_DDResultGetCategory(coreResult)));
</span><span class="cx"> anchorElement->setAttribute(x_apple_data_detectors_resultAttr, identifier);
</span><ins>+
+ parentNode->insertBefore(WTFMove(anchorElement), &currentTextNode);
+
</ins><span class="cx"> contentOffset = range->endOffset();
</span><span class="cx">
</span><del>- lastNodeContent = currentTextNode.substringData(range->endOffset(), currentTextNode.length() - range->endOffset(), ASSERT_NO_EXCEPTION);
</del><ins>+ lastNodeContent = currentTextNode.data().substring(range->endOffset(), currentTextNode.length() - range->endOffset());
</ins><span class="cx"> lastTextNodeToUpdate = &currentTextNode;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>