From 465864a6d72a2505b7a725ddaadfff05cdece8fc Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 13 Aug 2012 15:32:16 -0700 Subject: DO NOT MERGE Null check Cherry pick Bug: 6975836 Fixes a crash in find on page Change-Id: I20e1597f2f3a381ee693c1bcef944243ca654110 --- .../platform/graphics/android/context/GraphicsContextAndroid.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- cgit v1.1