From: Lukasz Bardeli Date: Tue, 12 Jul 2016 08:03:20 +0000 (+0200) Subject: [NFC] fix crash X-Git-Tag: submit/tizen/20160808.053811~15^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F45%2F79645%2F2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [NFC] fix crash Change-Id: I44c430d4f167d3c0fa4aea7ccb7a6f0b66e38c0d Signed-off-by: Lukasz Bardeli --- diff --git a/src/nfc/nfc_adapter.cc b/src/nfc/nfc_adapter.cc index 911f34de..18683f53 100644 --- 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 781f90e8..ed064ff6 100644 --- 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(