Title: [202473] branches/safari-602.1.38-branch/Source/WebCore
Revision
202473
Author
[email protected]
Date
2016-06-26 10:21:24 -0700 (Sun, 26 Jun 2016)

Log Message

Merged r202472.  rdar://problem/27014649

Modified Paths

Diff

Modified: branches/safari-602.1.38-branch/Source/WebCore/ChangeLog (202472 => 202473)


--- branches/safari-602.1.38-branch/Source/WebCore/ChangeLog	2016-06-26 16:25:49 UTC (rev 202472)
+++ branches/safari-602.1.38-branch/Source/WebCore/ChangeLog	2016-06-26 17:21:24 UTC (rev 202473)
@@ -1,3 +1,22 @@
+2016-06-26  Babak Shafiei  <[email protected]>
+
+        Merge r202472.
+
+    2016-06-26  Chris Dumez  <[email protected]>
+
+            Regression(r202262): Infinite loop under searchForLinkRemovingExistingDDLinks()
+            https://bugs.webkit.org/show_bug.cgi?id=159122
+            <rdar://problem/27014649>
+
+            Reviewed by Ryosuke Niwa.
+
+            Infinite loop under searchForLinkRemovingExistingDDLinks() because the
+            value returned by NodeTraversal::next() was ignored and the node iterator
+            was never updated.
+
+            * editing/cocoa/DataDetection.mm:
+            (WebCore::searchForLinkRemovingExistingDDLinks):
+
 2016-06-23  Babak Shafiei  <[email protected]>
 
         Merge patch for rdar://problem/26831566.

Modified: branches/safari-602.1.38-branch/Source/WebCore/editing/cocoa/DataDetection.mm (202472 => 202473)


--- branches/safari-602.1.38-branch/Source/WebCore/editing/cocoa/DataDetection.mm	2016-06-26 16:25:49 UTC (rev 202472)
+++ branches/safari-602.1.38-branch/Source/WebCore/editing/cocoa/DataDetection.mm	2016-06-26 17:21:24 UTC (rev 202473)
@@ -277,7 +277,7 @@
 static bool searchForLinkRemovingExistingDDLinks(Node& startNode, Node& endNode, bool& didModifyDOM)
 {
     didModifyDOM = false;
-    for (Node* node = &startNode; node; NodeTraversal::next(*node)) {
+    for (Node* node = &startNode; node; node = NodeTraversal::next(*node, &startNode)) {
         if (is<HTMLAnchorElement>(*node)) {
             auto& anchor = downcast<HTMLAnchorElement>(*node);
             if (!equalIgnoringASCIICase(anchor.fastGetAttribute(x_apple_data_detectorsAttr), "true"))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to