From 775c2b8116ddd38e944ae9e3d359a1a562938512 Mon Sep 17 00:00:00 2001
From: Vinay Kalia <vinaykalia@google.com>
Date: Mon, 12 Mar 2018 13:39:55 -0700
Subject: Fix NPE

Fix null pointer access when phNxpNciHal_open fails.

BUG: 74447424
Test: Device boot up and confirmed there is no NFC crash
Change-Id: Ic464e6297a702026effc76992c36870510a0875c
---
 halimpl/hal/phNxpNciHal.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/halimpl/hal/phNxpNciHal.cc b/halimpl/hal/phNxpNciHal.cc
index 57463b9..24c994f 100755
--- a/halimpl/hal/phNxpNciHal.cc
+++ b/halimpl/hal/phNxpNciHal.cc
@@ -769,8 +769,10 @@ int phNxpNciHal_open(nfc_stack_callback_t* p_cback,
 clean_and_return:
   CONCURRENCY_UNLOCK();
   /* Report error status */
-  (*nxpncihal_ctrl.p_nfc_stack_cback)(HAL_NFC_OPEN_CPLT_EVT,
-                                      HAL_NFC_STATUS_FAILED);
+  if (p_cback != NULL) {
+    (*p_cback)(HAL_NFC_OPEN_CPLT_EVT,
+               HAL_NFC_STATUS_FAILED);
+  }
 
   nxpncihal_ctrl.p_nfc_stack_cback = NULL;
   nxpncihal_ctrl.p_nfc_stack_data_cback = NULL;
-- 
cgit v1.2.3