summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-08-13 15:32:16 -0700
committerJohn Reck <jreck@google.com>2012-08-13 15:35:59 -0700
commit465864a6d72a2505b7a725ddaadfff05cdece8fc (patch)
tree3dc1b042d0b7ddfa1921fc6209b032b3529b3580
parent28c43cfac56492d4d307386c44ab9a1121f7d3bf (diff)
downloadexternal_webkit-465864a6d72a2505b7a725ddaadfff05cdece8fc.zip
external_webkit-465864a6d72a2505b7a725ddaadfff05cdece8fc.tar.gz
external_webkit-465864a6d72a2505b7a725ddaadfff05cdece8fc.tar.bz2
DO NOT MERGE Null check
Cherry pick Bug: 6975836 Fixes a crash in find on page Change-Id: I20e1597f2f3a381ee693c1bcef944243ca654110
-rw-r--r--Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp b/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
index 3b93d51..d6fa5ce 100644
--- a/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
@@ -60,7 +60,7 @@ public:
: m_context(platformContext) { }
~GraphicsContextPlatformPrivate()
{
- if (m_context->deleteUs())
+ if (m_context && m_context->deleteUs())
delete m_context;
}