diff options
| author | John Reck <jreck@google.com> | 2012-02-27 15:40:02 -0800 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2012-02-27 17:56:36 -0800 |
| commit | 9b759976fec55ad944eba534a560c9c83400ed91 (patch) | |
| tree | c5f886458f9866b82a0780ca52a799a288d0cd5a /Source/WebKit/android/jni/AndroidHitTestResult.cpp | |
| parent | 55fce40b4f3cdc9f93daba59d8ff9c311de4b9c0 (diff) | |
| download | external_webkit-9b759976fec55ad944eba534a560c9c83400ed91.zip external_webkit-9b759976fec55ad944eba534a560c9c83400ed91.tar.gz external_webkit-9b759976fec55ad944eba534a560c9c83400ed91.tar.bz2 | |
Fix content detector crashes
Bug: 6075831
Add some sanity checks to AndroidHitTestResult
Update DOMTextContentWalker to latest which had some extra checks
Change-Id: If6d129e78712c8cfc5ec84e48487e32cc585680f
Diffstat (limited to 'Source/WebKit/android/jni/AndroidHitTestResult.cpp')
| -rw-r--r-- | Source/WebKit/android/jni/AndroidHitTestResult.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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) { |