Merge "Fix content detector crashes"

2 files changed, 14 insertions, 4 deletions

diff --git a/Source/WebCore/dom/DOMTextContentWalker.cpp b/Source/WebCore/dom/DOMTextContentWalker.cpp
index ccbe1ec..5e77db1 100644
--- a/Source/WebCore/dom/DOMTextContentWalker.cpp
+++ b/Source/WebCore/dom/DOMTextContentWalker.cpp
@@ -44,15 +44,20 @@ DOMTextContentWalker::DOMTextContentWalker(const VisiblePosition& position, unsi
     : m_hitOffsetInContent(0)
 {
     const unsigned halfMaxLength = maxLength / 2;
-    CharacterIterator forwardChar(makeRange(position, endOfDocument(position)).get(), TextIteratorStopsOnFormControls);
+    RefPtr<Range> forwardRange = makeRange(position, endOfDocument(position));
+    if (!forwardRange)
+        return;
+    CharacterIterator forwardChar(forwardRange.get(), TextIteratorStopsOnFormControls);
     forwardChar.advance(maxLength - halfMaxLength);
 
     // No forward contents, started inside form control.
-    RefPtr<Range> range = getRange(position.deepEquivalent(), forwardChar.range()->startPosition());
-    if (!range.get() || range->text().length() == 0)
+    if (getRange(position.deepEquivalent(), forwardChar.range()->startPosition())->text().length() == 0)
         return;
 
-    BackwardsCharacterIterator backwardsChar(makeRange(startOfDocument(position), position).get(), TextIteratorStopsOnFormControls);
+    RefPtr<Range> backwardsRange = makeRange(startOfDocument(position), position);
+    if (!backwardsRange)
+        return;
+    BackwardsCharacterIterator backwardsChar(backwardsRange.get(), TextIteratorStopsOnFormControls);
     backwardsChar.advance(halfMaxLength);
 
     m_hitOffsetInContent = getRange(backwardsChar.range()->endPosition(), position.deepEquivalent())->text().length();
diff --git a/Source/WebKit/android/jni/AndroidHitTestResult.cpp b/Source/WebKit/android/jni/AndroidHitTestResult.cpp
index f5dcc48..16dd809 100644
--- a/Source/WebKit/android/jni/AndroidHitTestResult.cpp
+++ b/Source/WebKit/android/jni/AndroidHitTestResult.cpp
@@ -151,6 +151,11 @@ void AndroidHitTestResult::searchContentDetectors()
 {
     AddressDetector address;
     PhoneEmailDetector phoneEmail;
+    Node* node = m_hitTestResult.innerNode();
+    if (!node || !node->isTextNode())
+        return;
+    if (!m_hitTestResult.absoluteLinkURL().isEmpty())
+        return;
     WebKit::WebHitTestInfo webHitTest(m_hitTestResult);
     m_searchResult = address.FindTappedContent(webHitTest);
     if (!m_searchResult.valid) {