summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-08-13 15:35:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-13 15:35:39 -0700
commit4026b622692441fead45a1b1cc5866e4ba1d4a6f (patch)
tree1263082c82ec725e73c8ca5ee2b88ad35008b397
parent5b762b05d1ca3f7f73b0b017aeeceda544a82bb6 (diff)
parent826961ccc92c603300f18b4acd5adf6093c64cb3 (diff)
downloadexternal_webkit-4026b622692441fead45a1b1cc5866e4ba1d4a6f.zip
external_webkit-4026b622692441fead45a1b1cc5866e4ba1d4a6f.tar.gz
external_webkit-4026b622692441fead45a1b1cc5866e4ba1d4a6f.tar.bz2
Merge "Null check" into jb-mr1-dev
-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 23b22e6..957040b 100644
--- a/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/context/GraphicsContextAndroid.cpp
@@ -59,7 +59,7 @@ public:
: m_context(platformContext) { }
~GraphicsContextPlatformPrivate()
{
- if (m_context->deleteUs())
+ if (m_context && m_context->deleteUs())
delete m_context;
}