1 files changed, 6 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 9b5a6fa..6976e00 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -2219,12 +2219,16 @@ void WebViewCore::scrollNodeIntoView(Frame* frame, Node* node)
     if (!node->isElementNode()) {
         HTMLElement* body = frame->document()->body();
         do {
-            if (!node || node == body)
+            if (node == body)
                 return;
             node = node->parentNode();
-        } while (!node->isElementNode() && !isVisible(node));
+        } while (node && !node->isElementNode() && !isVisible(node));
     }
 
+    // Couldn't find a visible predecessor.
+    if (!node)
+        return;
+
     elementNode = static_cast<Element*>(node);
     elementNode->scrollIntoViewIfNeeded(true);
 }