Revert "Revert "Fixed Prevent issues.""

This reverts commit c1bdfd77e6f7da42989d6db6f92e6d0e29808721.

Change-Id: I6b30d3b202d3a0ecb14af80f506a06424c73e415
Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>

12 files changed, 32 insertions, 11 deletions

diff --git a/src/FSecSe_SecureElementChannelCloseResponseListenerEvent.cpp b/src/FSecSe_SecureElementChannelCloseResponseListenerEvent.cpp
index 7b6403d..7e7c105 100644
--- a/src/FSecSe_SecureElementChannelCloseResponseListenerEvent.cpp
+++ b/src/FSecSe_SecureElementChannelCloseResponseListenerEvent.cpp
@@ -51,7 +51,10 @@ _SecureElementChannelCloseResponseListenerEvent::FireImpl(Tizen::Base::Runtime::
 	RequestId reqId;
 
 	ISecureElementChannelCloseResponseListener* pSecureElementChannelCloseResponseListener = dynamic_cast< ISecureElementChannelCloseResponseListener* >(&listener);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementChannelCloseResponseListener != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
+
 	const _SecureElementChannelCloseResponseListenerEventArg* pSecureElementChannelCloseResponseListenerEventArg = dynamic_cast< const _SecureElementChannelCloseResponseListenerEventArg* >(&arg);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementChannelCloseResponseListenerEventArg != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
 
 	reqId = pSecureElementChannelCloseResponseListenerEventArg->GetRequestId();
 
diff --git a/src/FSecSe_SecureElementChannelImpl.cpp b/src/FSecSe_SecureElementChannelImpl.cpp
index 0171117..fcc1a34 100644
--- a/src/FSecSe_SecureElementChannelImpl.cpp
+++ b/src/FSecSe_SecureElementChannelImpl.cpp
@@ -155,7 +155,7 @@ _SecureElementChannelImpl::Close(ISecureElementChannelCloseResponseListener* pLi
 	r = pEventClose->AddListener(*pListener);
 	SysTryReturnResult(NID_SEC, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	__pEventClose = move(pEventClose);
+	__pEventClose = std::move(pEventClose);
 
 	ret = __pClientChannel->close(ChannelCloseCallbackHandler, this);
 	SysTryReturnResult(NID_SEC, ret == 0, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
@@ -213,7 +213,7 @@ _SecureElementChannelImpl::Transmit(const Tizen::Base::ByteBuffer* pCommand, ISe
 
 	command.setBuffer(pBufferValue, value);
 
-	__pEventTransmit = move(pEventTransmit);
+	__pEventTransmit = std::move(pEventTransmit);
 
 	ret = __pClientChannel->transmit(command, TransmitCallbackHandler, this);
 	SysTryReturnResult(NID_SEC, ret == 0, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
diff --git a/src/FSecSe_SecureElementChannelTransmitResponseListenerEvent.cpp b/src/FSecSe_SecureElementChannelTransmitResponseListenerEvent.cpp
index 93dd0f9..abd8178 100644
--- a/src/FSecSe_SecureElementChannelTransmitResponseListenerEvent.cpp
+++ b/src/FSecSe_SecureElementChannelTransmitResponseListenerEvent.cpp
@@ -50,7 +50,10 @@ _SecureElementChannelTransmitResponseListenerEvent::FireImpl(Tizen::Base::Runtim
 	RequestId reqId;
 
 	ISecureElementChannelTransmitResponseListener* pSecureElementChannelTransmitResponseListener = dynamic_cast< ISecureElementChannelTransmitResponseListener* >(&listener);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementChannelTransmitResponseListener != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
+
 	const _SecureElementChannelTransmitResponseListenerEventArg* pSecureElementChannelTransmitResponseListenerEventArg = dynamic_cast< const _SecureElementChannelTransmitResponseListenerEventArg* >(&arg);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementChannelTransmitResponseListenerEventArg != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
 
 	reqId = pSecureElementChannelTransmitResponseListenerEventArg->GetRequestId();
 
diff --git a/src/FSecSe_SecureElementChannelTransmitResponseListenerEventArg.cpp b/src/FSecSe_SecureElementChannelTransmitResponseListenerEventArg.cpp
index c76350c..fee7418 100644
--- a/src/FSecSe_SecureElementChannelTransmitResponseListenerEventArg.cpp
+++ b/src/FSecSe_SecureElementChannelTransmitResponseListenerEventArg.cpp
@@ -26,7 +26,7 @@ namespace Tizen { namespace Security { namespace SecureElement
 
 _SecureElementChannelTransmitResponseListenerEventArg::_SecureElementChannelTransmitResponseListenerEventArg(RequestId reqId, Tizen::Base::ByteBuffer* pResponse, result r)
 	: __pReqId(reqId)
-	, __pResponse(null)
+	, __pResponse(pResponse)
 	, __r(r)
 {
 	// empty body
diff --git a/src/FSecSe_SecureElementReaderImpl.cpp b/src/FSecSe_SecureElementReaderImpl.cpp
index 15549a3..0647422 100644
--- a/src/FSecSe_SecureElementReaderImpl.cpp
+++ b/src/FSecSe_SecureElementReaderImpl.cpp
@@ -123,7 +123,7 @@ _SecureElementReaderImpl::OpenSession(ISecureElementReaderOpenSessionResponseLis
 	r = pSecureElementReaderOpenSessionResponseEvent->AddListener(*pListener);
 	SysTryReturnResult(NID_SEC, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	__pEventSecureElementReader = move(pSecureElementReaderOpenSessionResponseEvent);
+	__pEventSecureElementReader = std::move(pSecureElementReaderOpenSessionResponseEvent);
 
 	ret = __pReader->openSession(OpenSessionCallbackHandler, this);
 	SysTryReturnResult(NID_SEC, ret == 0, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
diff --git a/src/FSecSe_SecureElementReaderOpenSessionResponseEvent.cpp b/src/FSecSe_SecureElementReaderOpenSessionResponseEvent.cpp
index 4e84e2d..a84f0b9 100644
--- a/src/FSecSe_SecureElementReaderOpenSessionResponseEvent.cpp
+++ b/src/FSecSe_SecureElementReaderOpenSessionResponseEvent.cpp
@@ -51,8 +51,12 @@ _SecureElementReaderOpenSessionResponseEvent::FireImpl(Tizen::Base::Runtime::IEv
 
 	result r = E_SUCCESS;
 	RequestId reqId;
+
 	ISecureElementReaderOpenSessionResponseListener* pSecureElementReaderOpenSessionResponseListener = dynamic_cast< ISecureElementReaderOpenSessionResponseListener* >(&listener);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementReaderOpenSessionResponseListener != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
+
 	const _SecureElementReaderOpenSessionResponseArg* pSecureElementReaderOpenSessionResponseArg = dynamic_cast< const _SecureElementReaderOpenSessionResponseArg* >(&arg);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementReaderOpenSessionResponseArg != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
 
 	reqId = pSecureElementReaderOpenSessionResponseArg->GetRequestId();
 
diff --git a/src/FSecSe_SecureElementServiceEvent.cpp b/src/FSecSe_SecureElementServiceEvent.cpp
index bf07169..d3af34d 100644
--- a/src/FSecSe_SecureElementServiceEvent.cpp
+++ b/src/FSecSe_SecureElementServiceEvent.cpp
@@ -49,7 +49,9 @@ void
 _SecureElementServiceEvent::FireImpl(Tizen::Base::Runtime::IEventListener& listener, const Tizen::Base::Runtime::IEventArg& arg)
 {
 	result r = E_SUCCESS;
+
 	const _SecureElementServiceEventArg* pSecureElementServiceEventArg = dynamic_cast< const _SecureElementServiceEventArg* >(&arg);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementServiceEventArg != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
 
 	ISecureElementServiceEventListener* pSecureElementServiceListener = reinterpret_cast< ISecureElementServiceEventListener* >(&listener);
 	SysTryReturnVoidResult(NID_SEC, pSecureElementServiceListener != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
diff --git a/src/FSecSe_SecureElementServiceImpl.cpp b/src/FSecSe_SecureElementServiceImpl.cpp
index 3a9785a..c8ccb79 100644
--- a/src/FSecSe_SecureElementServiceImpl.cpp
+++ b/src/FSecSe_SecureElementServiceImpl.cpp
@@ -168,9 +168,9 @@ _SecureElementServiceImpl::Initialize(ISecureElementServiceEventListener* pListe
 	std::unique_ptr< SEService > pService(new (std::nothrow) SEService(this, pSecureElementServiceCallback.get()));
 	SysTryReturnResult(NID_SEC, pService != null, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
-	__pServiceEvent = move(pServiceEvent);
-	__pSecureElementServiceCallback = move(pSecureElementServiceCallback);
-	__pService = move(pService);
+	__pServiceEvent = std::move(pServiceEvent);
+	__pSecureElementServiceCallback = std::move(pSecureElementServiceCallback);
+	__pService = std::move(pService);
 
 	return r;
 }
diff --git a/src/FSecSe_SecureElementSessionCloseResponseListenerEvent.cpp b/src/FSecSe_SecureElementSessionCloseResponseListenerEvent.cpp
index bc6bcb3..0cfe114 100644
--- a/src/FSecSe_SecureElementSessionCloseResponseListenerEvent.cpp
+++ b/src/FSecSe_SecureElementSessionCloseResponseListenerEvent.cpp
@@ -49,7 +49,10 @@ _SecureElementSessionCloseResponseListenerEvent::FireImpl(Tizen::Base::Runtime::
 	RequestId reqId;
 
 	ISecureElementSessionCloseResponseListener* pSecureElementSessionCloseResponseListener = dynamic_cast< ISecureElementSessionCloseResponseListener* >(&listener);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementSessionCloseResponseListener != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
+
 	const _SecureElementSessionCloseResponseListenerEventArg* pSecureElementSessionCloseResponseListenerEventArg = dynamic_cast< const _SecureElementSessionCloseResponseListenerEventArg* >(&arg);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementSessionCloseResponseListenerEventArg != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
 
 	reqId = pSecureElementSessionCloseResponseListenerEventArg->GetRequestId();
 
diff --git a/src/FSecSe_SecureElementSessionGetAtrEvent.cpp b/src/FSecSe_SecureElementSessionGetAtrEvent.cpp
index 3c09fbb..70ea2f0 100644
--- a/src/FSecSe_SecureElementSessionGetAtrEvent.cpp
+++ b/src/FSecSe_SecureElementSessionGetAtrEvent.cpp
@@ -52,7 +52,10 @@ _SecureElementSessionGetAtrEvent::FireImpl(Tizen::Base::Runtime::IEventListener&
 	RequestId reqId;
 
 	ISecureElementSessionGetAtrResponseListener* pSecureElementSessionGetAtrResponseListener = dynamic_cast< ISecureElementSessionGetAtrResponseListener* >(&listener);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementSessionGetAtrResponseListener != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
+
 	const _SecureElementSessionGetAtrEventArg* pSecureElementSessionGetAtrEventArg = dynamic_cast< const _SecureElementSessionGetAtrEventArg* >(&arg);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementSessionGetAtrEventArg != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
 
 	reqId = pSecureElementSessionGetAtrEventArg->GetRequestId();
 
diff --git a/src/FSecSe_SecureElementSessionImpl.cpp b/src/FSecSe_SecureElementSessionImpl.cpp
index b39f380..d16d1a5 100644
--- a/src/FSecSe_SecureElementSessionImpl.cpp
+++ b/src/FSecSe_SecureElementSessionImpl.cpp
@@ -63,7 +63,7 @@ _SecureElementSessionImpl::Construct(void)
 	r = pEventAtr->Construct();
 	SysTryReturnResult(NID_SEC, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	__pEventAtr = move(pEventAtr);
+	__pEventAtr = std::move(pEventAtr);
 
 	return r;
 }
@@ -238,7 +238,7 @@ _SecureElementSessionImpl::Close(ISecureElementSessionCloseResponseListener* pLi
 	r = pEventClose->AddListener(*pListener);
 	SysTryReturnResult(NID_SEC, r == E_SUCCESS, r, "[%s] Propagating.", GetErrorMessage(r));
 
-	__pEventClose = move(pEventClose);
+	__pEventClose = std::move(pEventClose);
 
 	ret = __pSession->close(CloseSessionCallbackHandler, this);
 	SysTryReturnResult(NID_SEC, ret == 0, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
@@ -304,7 +304,7 @@ _SecureElementSessionImpl::OpenBasicChannel(const Tizen::Base::ByteBuffer* pAid,
 
 	aid.setBuffer(pBufferValue, value);
 
-	__pEventChannelOpen = move(pEventChannelOpen);
+	__pEventChannelOpen = std::move(pEventChannelOpen);
 
 	ret = __pSession->openBasicChannel(aid, OpenChannelCallbackHandler, this);
 	SysTryReturnResult(NID_SEC, ret == 0, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
@@ -347,7 +347,7 @@ _SecureElementSessionImpl::OpenLogicalChannel(const Tizen::Base::ByteBuffer* pAi
 
 	aid.setBuffer(pBuffer, bufferLen);
 
-	__pEventChannelOpen = move(pEventChannelOpen);
+	__pEventChannelOpen = std::move(pEventChannelOpen);
 
 	ret = __pSession->openLogicalChannel(aid, OpenChannelCallbackHandler, this);
 	SysTryReturnResult(NID_SEC, ret == 0, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
diff --git a/src/FSecSe_SecureElementSessionOpenChannelResponseListenerEvent.cpp b/src/FSecSe_SecureElementSessionOpenChannelResponseListenerEvent.cpp
index 7fa6011..6f2985a 100644
--- a/src/FSecSe_SecureElementSessionOpenChannelResponseListenerEvent.cpp
+++ b/src/FSecSe_SecureElementSessionOpenChannelResponseListenerEvent.cpp
@@ -51,7 +51,10 @@ _SecureElementSessionOpenChannelResponseListenerEvent::FireImpl(Tizen::Base::Run
 	RequestId reqId;
 
 	ISecureElementSessionOpenChannelResponseListener* pSecureElementSessionOpenChannelResponseListener = dynamic_cast< ISecureElementSessionOpenChannelResponseListener* >(&listener);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementSessionOpenChannelResponseListener != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
+
 	const _SecureElementSessionOpenChannelResponseListenerEventArg* pSecureElementSessionOpenChannelResponseListenerEventArg = dynamic_cast< const _SecureElementSessionOpenChannelResponseListenerEventArg* >(&arg);
+	SysTryReturnVoidResult(NID_SEC, pSecureElementSessionOpenChannelResponseListenerEventArg != null, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error.");
 
 	reqId = pSecureElementSessionOpenChannelResponseListenerEventArg->GetRequestId();