commit 9a0e58f6eac7836d381df960fe001d4d4ca77cf8
author Joey Qiao <joey.qiao@sonymobile.com> Thu Aug 23 19:09:18 2018 +0900
committer Hiroki Yamamoto <Hiroki.A.Yamamoto@sony.com> Thu Aug 23 10:25:02 2018 +0000
tree b41c25afdd5b8702fd27bc403b8bd87fe63b4543
parent e94a667d845bfa7c1c6f8aab4d4cfa57cf8d3bd7

Remove unnecessary free

Crash occurs when call free() to release psUpperNdefMsg->buffer
on Deinit(). For ReadNdef, it's not necessary as it will be free
when completion. For WriteNdef, the buffer is passed from caller
which is not a malloc memory. So it shall not call free() then.

Test: Read/Write Mifare tag and turn off/on NFC
Bug: 113068296
Change-Id: Iac5243c4117d08a569f8887316bf628cacbbf7e8

nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp

diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
index 1261c3f..8545a56 100644
--- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp
@@ -145,10 +145,6 @@
   pthread_mutex_lock(&SharedDataMutex);
 #endif
   if (NULL != NdefInfo.psUpperNdefMsg) {
-    if (NdefInfo.psUpperNdefMsg->buffer != NULL) {
-      free(NdefInfo.psUpperNdefMsg->buffer);
-      NdefInfo.psUpperNdefMsg->buffer = NULL;
-    }
     free(NdefInfo.psUpperNdefMsg);
     NdefInfo.psUpperNdefMsg = NULL;
   }