From 40354f8b4f508869d4e42a959552fe87d4939dc6 Mon Sep 17 00:00:00 2001 From: Seokju Kwon Date: Mon, 6 Aug 2012 20:01:58 +0900 Subject: [PATCH] [WK2] Fix crash issue while terminating webapp [Title] Fix crash issue while terminating webapp [Issue#] N_SE-5438 [Problem] Occurs B/S [Cause] NULL Pointer Access [Solution] Add exception code Change-Id: I25caa4c6bf14584f4dccac7ee23c4583cccb063e --- Source/WebCore/inspector/InspectorCSSAgent.cpp | 2 +- Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/inspector/InspectorCSSAgent.cpp b/Source/WebCore/inspector/InspectorCSSAgent.cpp index 26150ea..60461d3 100644 --- a/Source/WebCore/inspector/InspectorCSSAgent.cpp +++ b/Source/WebCore/inspector/InspectorCSSAgent.cpp @@ -487,7 +487,7 @@ void InspectorCSSAgent::clearFrontend() { ASSERT(m_frontend); m_frontend = 0; -#if ENABLE(TIZEN_REMOTE_WEB_INSPECTOR) +#if ENABLE(TIZEN_REMOTE_WEB_INSPECTOR) || ENABLE(TIZEN_WEBKIT2_REMOTE_WEB_INSPECTOR) clearPseudoState(false); #else clearPseudoState(true); diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp index 6b47233..d1f76ca 100644 --- a/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp +++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebInspectorClient.cpp @@ -43,6 +43,9 @@ namespace WebKit { #if ENABLE(TIZEN_WEBKIT2_REMOTE_WEB_INSPECTOR) void WebInspectorClient::attachRemoteFrontend() { + if (!m_page || !m_page->corePage()) + return; + Settings* settings = m_page->corePage()->settings(); if (settings) settings->setDeveloperExtrasEnabled(true); @@ -55,6 +58,9 @@ void WebInspectorClient::attachRemoteFrontend() void WebInspectorClient::detachRemoteFrontend() { + if (!m_page || !m_page->corePage()) + return; + Settings* settings = m_page->corePage()->settings(); if (settings) settings->setDeveloperExtrasEnabled(false); -- 2.7.4