[NFC] fix crash

Change-Id: I44c430d4f167d3c0fa4aea7ccb7a6f0b66e38c0d
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>

diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc
index 911f34dee9e6f4ce87567b6b4a11b609a0fe61d4..18683f538ac673de4e7eb861b33baf4675d4b491 100644 (file)
--- a/src/nfc/nfc_adapter.cc
+++ b/src/nfc/nfc_adapter.cc
@@ -141,8 +141,12 @@ void NFCAdapter::SetResponder(IResponder* responder) {
 
 void NFCAdapter::RespondAsync(const char* msg) {
   LoggerD("Entered");
-  AssertMsg(GetInstance()->responder_, "Handler variable should be set");
-  GetInstance()->responder_->RespondAsync(msg);
+  if (GetInstance()->responder_) {
+    AssertMsg(GetInstance()->responder_, "Handler variable should be set");
+    GetInstance()->responder_->RespondAsync(msg);
+  } else {
+    LoggerE("Ignoring, instance does not exist");
+  }
 }
 
 static picojson::value CreateEventError(double callbackId, const PlatformResult& ret) {

diff --git a/src/nfc/nfc_instance.cc b/src/nfc/nfc_instance.cc
index 781f90e80f1317d1f2b0c06fee4b625450b523a5..ed064ff665ab0bc933da0d91a34ddd38e2703e29 100644 (file)
--- a/src/nfc/nfc_instance.cc
+++ b/src/nfc/nfc_instance.cc
@@ -160,6 +160,7 @@ NFCInstance::NFCInstance() {
 
 NFCInstance::~NFCInstance() {
   LoggerD("Entered");
+  NFCAdapter::GetInstance()->SetResponder(nullptr);
 }
 
 void NFCInstance::GetDefaultAdapter(