commit b2de8a7953d9d7a7e47cc692df32fea9bd2f80c5
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 09 00:11:53 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 09 00:11:53 2022 +0000
tree 8761b35261e1a253571a74deea44d7a71157c268
parent b8a1187ba0ab106f8ab7857f173052f69020d173
parent f794f1134d32228a6903cd26fa6be8323a228cef

Snap for 8920865 from f794f1134d32228a6903cd26fa6be8323a228cef to tm-qpr1-release

Change-Id: I198899cabee0510990de2b804e2d2c4fa0148bb3

bcmdhd/wifi_hal/nan.cpp

diff --git a/bcmdhd/wifi_hal/nan.cpp b/bcmdhd/wifi_hal/nan.cpp
index 52f29e3..8b9bec4 100755
--- a/bcmdhd/wifi_hal/nan.cpp
+++ b/bcmdhd/wifi_hal/nan.cpp
@@ -4413,7 +4413,8 @@
         ALOGE("Disable NAN MAC transId= %d\n", id);
         mac_prim->setId(id);
     } else {
-        ALOGE("Invalid transId= %d cur= %d\n", id, mac_prim->getId());
+        ALOGE("Invalid transId= %d cur= %d\n", id,
+              mac_prim ? mac_prim->getId() : -1);
     }
 
     cmd->setChreNan(0);