commit c2d17ee05be5995cd86bb98016565a0070564d0a
author Kyle Hsiao <kylehsiao@google.com> Wed Jul 30 09:49:47 2025 +0000
committer Kyle Hsiao <kylehsiao@google.com> Wed Jul 30 10:10:52 2025 +0000
tree 7c9973f4e9c2b14b5fc072cd20773ced74eb3d73
parent 62c7da3af9ddf592556cefa41a0fec9e3a18ce57

Add a null check in rw_mfc_send_to_lower

Bug: 412478528
Test: Manual
Flag: EXEMPT bug bix
Change-Id: Ia7ebc3d492b58a562d770766c00e2e727021edf2

libnfc-nci/src/nfc/tags/rw_mfc.cc

diff --git a/libnfc-nci/src/nfc/tags/rw_mfc.cc b/libnfc-nci/src/nfc/tags/rw_mfc.cc
index bd3f66c..c0f4a89 100644
--- a/libnfc-nci/src/nfc/tags/rw_mfc.cc
+++ b/libnfc-nci/src/nfc/tags/rw_mfc.cc
@@ -637,8 +637,12 @@
   /* Indicate first attempt to send command, back up cmd buffer in case needed
    * for retransmission */
   rw_cb.cur_retry = 0;
-  memcpy(p_mfc->p_cur_cmd_buf, p_data,
-         sizeof(NFC_HDR) + p_data->offset + p_data->len);
+  if (!p_mfc->p_cur_cmd_buf) {
+    LOG(ERROR) << StringPrintf("%s: p_mfc->p_cur_cmd_buf null", __func__);
+  } else {
+    memcpy(p_mfc->p_cur_cmd_buf, p_data,
+           sizeof(NFC_HDR) + p_data->offset + p_data->len);
+  }
 
   if (NFC_SendData(NFC_RF_CONN_ID, p_data) != NFC_STATUS_OK) {
     LOG(ERROR) << __func__ << ": NFC_SendData () failed";