summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2009-05-18 13:51:42 -0400
committerCary Clark <cary@android.com>2009-05-18 13:51:42 -0400
commit73d131bc28aa2a68fe686ffd9426814448f5da7b (patch)
tree6e4a9e4bf22bda15351480ae9d734d6f5dfc7492
parent04ba6fe32f62eed169e84e33d178552b8b4c0792 (diff)
downloadexternal_webkit-73d131bc28aa2a68fe686ffd9426814448f5da7b.zip
external_webkit-73d131bc28aa2a68fe686ffd9426814448f5da7b.tar.gz
external_webkit-73d131bc28aa2a68fe686ffd9426814448f5da7b.tar.bz2
fix browser monkey crash; add null check
http://b/issue?id=1742161
-rw-r--r--WebKit/android/nav/WebView.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 3d7a0bf..8b7b6b9 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -1377,6 +1377,8 @@ bool motionUp(int x, int y, int slop, bool inval, bool retry)
WebCore::IntRect rect = WebCore::IntRect(x - slop, y - slop, slop * 2, slop * 2);
int rx, ry;
CachedRoot* root = getFrameCache(AllowNewer);
+ if (!root)
+ return false;
const CachedNode* result = findAt(root, rect, &frame, &rx, &ry);
if (!result) {
DBG_NAV_LOGD("no nodes found root=%p", root);