summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarthikeyan Periasamy <kperiasa@codeaurora.org>2012-09-18 16:56:53 -0700
committerSteve Kondik <shade@chemlab.org>2013-01-21 01:19:50 -0800
commit970019d07554a94ff4ddda8a592624005fe0c4c4 (patch)
tree3dddecf1f701bbbe352238ed28a1d6cb072d2e80
parent861433c933e8af5fa97db1174266f81f605c721c (diff)
downloadexternal_webkit-970019d07554a94ff4ddda8a592624005fe0c4c4.zip
external_webkit-970019d07554a94ff4ddda8a592624005fe0c4c4.tar.gz
external_webkit-970019d07554a94ff4ddda8a592624005fe0c4c4.tar.bz2
external/webkit: check element object for NULL
Change-Id: I11ff74169b4ec0017400e9ef9451868ae00c6b1b
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 23bd873..f8cd5ca 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -1,8 +1,8 @@
/*
* Copyright 2006, The Android Open Source Project
- * Copyright (C) 2011, 2012 The Linux Foundation All rights reserved.
* Copyright (C) 2012 Sony Ericsson Mobile Communications AB.
* Copyright (C) 2012 Sony Mobile Communications AB
+ * Copyright (c) 2011,2012 The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -2830,7 +2830,7 @@ bool WebViewCore::isVisible(Node* node)
else
element = node->parentElement();
// check renderer
- if (!element->renderer()) {
+ if (!element || !element->renderer()) {
return false;
}
// check size