From f7dc5045e25e383443ea08228593aa2d3acb0cd9 Mon Sep 17 00:00:00 2001 From: SeungWon Lee Date: Wed, 3 Apr 2013 23:46:45 +0900 Subject: [PATCH] Fix the Prevent CID 48468 Dereference after null check. Change-Id: I7e8311a9f1b52e045fda6b3734fcaa903720708e Signed-off-by: SeungWon Lee --- src/ui/scenes/FUiScenes_SceneManagerImpl.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ui/scenes/FUiScenes_SceneManagerImpl.cpp b/src/ui/scenes/FUiScenes_SceneManagerImpl.cpp index 801d9f6..590a37e 100644 --- a/src/ui/scenes/FUiScenes_SceneManagerImpl.cpp +++ b/src/ui/scenes/FUiScenes_SceneManagerImpl.cpp @@ -1134,7 +1134,10 @@ _SceneManagerImpl::GotoScene(bool forward, const SceneId& sceneId, SceneTransiti r = SetInputEventEnableState(*pForm, false); if (IsFailed(r)) { - SetInputEventEnableState(*__pCurrentScene->GetForm(), true); + if (__pCurrentScene) + { + SetInputEventEnableState(*__pCurrentScene->GetForm(), true); + } } SysTryCatch(NID_UI_SCENES, !IsFailed(r), , r, "[%s] Propagating.", GetErrorMessage(r)); } -- 2.7.4