From: Hyunbin Lee <hyunbin.lee@samsung.com>
Date: Wed, 17 Apr 2013 04:38:26 +0000 (+0900)
Subject: Check null pointer (N_SE-34778)
X-Git-Tag: 2.1b_release~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc998c3e27ed56c4426c8b73eab23fc6ff73c449;p=samples%2Fnative%2FDictionaryDataControl.git

Check null pointer (N_SE-34778)

Change-Id: I30972b6930e47313fa28438dedc4cde578dfad1a
Signed-off-by: Hyunbin Lee <hyunbin.lee@samsung.com>
---

diff --git a/project/src/MapDataControlForm.cpp b/project/src/MapDataControlForm.cpp
index a943afb..4fa6e74 100644
--- a/project/src/MapDataControlForm.cpp
+++ b/project/src/MapDataControlForm.cpp
@@ -97,7 +97,10 @@ result
 MapDataControlForm::OnTerminating(void)
 {
 	delete __pPopup;
-	__pMapDataControl->SetMapDataControlResponseListener(null);
+	if (__pMapDataControl != null)
+	{
+		__pMapDataControl->SetMapDataControlResponseListener(null);
+	}
 	return E_SUCCESS;
 }
 
@@ -105,7 +108,10 @@ void
 MapDataControlForm::OnFormBackRequested(Form& source)
 {
 	AppLog("OnFormBackRequested.");
-	__pMapDataControl->SetMapDataControlResponseListener(null);
+	if (__pMapDataControl != null)
+	{
+		__pMapDataControl->SetMapDataControlResponseListener(null);
+	}
 	SceneManager* pSceneManager = SceneManager::GetInstance();
 	pSceneManager->GoBackward(BackwardSceneTransition());
 }
diff --git a/project/src/SqlDataControlForm.cpp b/project/src/SqlDataControlForm.cpp
index 33e39c4..1487e34 100644
--- a/project/src/SqlDataControlForm.cpp
+++ b/project/src/SqlDataControlForm.cpp
@@ -99,7 +99,10 @@ result
 SqlDataControlForm::OnTerminating(void)
 {
 	delete __pPopup;
-	__pSqlDataControl->SetSqlDataControlResponseListener(null);
+	if (__pSqlDataControl != null)
+	{
+		__pSqlDataControl->SetSqlDataControlResponseListener(null);
+	}
 	return E_SUCCESS;
 }
 
@@ -107,7 +110,10 @@ void
 SqlDataControlForm::OnFormBackRequested(Form& source)
 {
 	AppLog("OnFormBackRequested.");
-	__pSqlDataControl->SetSqlDataControlResponseListener(null);
+	if (__pSqlDataControl != null)
+	{
+		__pSqlDataControl->SetSqlDataControlResponseListener(null);
+	}
 	SceneManager* pSceneManager = SceneManager::GetInstance();
 	pSceneManager->GoBackward(BackwardSceneTransition());
 }