From ec8a6d0ece5d73df59d3af8fa82e609084ef4e89 Mon Sep 17 00:00:00 2001 From: KwangYong Choi Date: Wed, 21 Aug 2013 19:15:46 +0900 Subject: [PATCH] Fix crash if the color picker is closed quickly [Title] Fix crash if the color picker is closed quickly. [Issue#] N_SE-49225 [Problem] TizenWinset web-app crashed. [Cause] Try to access invalid object. [Solution] Add null checking. Change-Id: Ib4e9006281ae11e52644703d7aa3f4e00a3e0aa7 --- Source/WebKit2/UIProcess/WebPageProxy.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp index 1b39b9c..70492dd 100755 --- a/Source/WebKit2/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp @@ -3179,14 +3179,24 @@ void WebPageProxy::showColorChooser(const WebCore::Color& initialColor) void WebPageProxy::setColorChooserColor(const WebCore::Color& color) { +#if ENABLE(TIZEN_INPUT_COLOR_PICKER) + if (!m_colorChooser) + return; +#else ASSERT(m_colorChooser); +#endif m_colorChooser->setSelectedColor(color); } void WebPageProxy::endColorChooser() { +#if ENABLE(TIZEN_INPUT_COLOR_PICKER) + if (!m_colorChooser) + return; +#else ASSERT(m_colorChooser); +#endif m_colorChooser->endChooser(); } -- 2.7.4