From a92b3d295dc953bd620c267b96b9278ac0e29c40 Mon Sep 17 00:00:00 2001 From: Lukasz Bardeli Date: Tue, 12 Jul 2016 10:03:20 +0200 Subject: [PATCH] [NFC] fix crash Change-Id: I44c430d4f167d3c0fa4aea7ccb7a6f0b66e38c0d Signed-off-by: Lukasz Bardeli --- src/nfc/nfc_adapter.cc | 8 ++++++-- src/nfc/nfc_instance.cc | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) 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( -- 2.34.1