commit d3d59de13eb629c37ca750a3cf081e99d6f9424c
author nxf48293 <priyanka.rajput@nxp.com> Mon Apr 22 18:14:28 2019 +0530
committer nxf35421 <sangeetha.agarwal@nxp.com> Tue May 28 11:29:13 2019 +0530
tree 27a4ad73d8b756f56f6a274578b248521c8f72b8
parent ebd86bf8f851ff9e9b3cabb85eb67ff5e37cb51e

Fixed coverity warnings.

Following are the types of warnings fixed:
UNINIT_CTOR, UNUSED_VALUE, IDENTICAL_BRANCHES

nci/jni/MposManager.cpp

diff --git a/nci/jni/MposManager.cpp b/nci/jni/MposManager.cpp
index 71dd2e3..d99ca65 100644
--- a/nci/jni/MposManager.cpp
+++ b/nci/jni/MposManager.cpp
@@ -29,6 +29,8 @@
 
 extern bool nfc_debug_enabled;
 
+MposManager::MposManager() { mNativeData = NULL; }
+
 namespace android {
 extern tNFA_STATUS EmvCo_dosetPoll(jboolean enable);
 extern bool isDiscoveryStarted();

nci/jni/MposManager.h

diff --git a/nci/jni/MposManager.h b/nci/jni/MposManager.h
index 2de6533..5d95363 100644
--- a/nci/jni/MposManager.h
+++ b/nci/jni/MposManager.h
@@ -77,6 +77,7 @@
 
 class MposManager {
  public:
+  MposManager();
   Rdr_req_ntf_info_t swp_rdr_req_ntf_info;
   static jmethodID gCachedMposManagerNotifyETSIReaderRequested;
   static jmethodID gCachedMposManagerNotifyETSIReaderRequestedFail;

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index f70ddc1..ff05f2f 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -7444,6 +7444,9 @@
 
     /*Constructor*/
     Command() : nfcAdapter(NfcAdaptation::GetInstance()) {
+      rspTimeout = 0;
+      retryCount = 0;
+      name = NULL;
       /*Retreive reference to HAL function manager*/
       halMgr = nfcAdapter.GetHalEntryFuncs();
     }

nci/jni/NativeNfcTag.cpp

diff --git a/nci/jni/NativeNfcTag.cpp b/nci/jni/NativeNfcTag.cpp
index 32b6a58..87edaee 100644
--- a/nci/jni/NativeNfcTag.cpp
+++ b/nci/jni/NativeNfcTag.cpp
@@ -661,6 +661,12 @@
 #endif
       } else {
         status = NFA_RwFormatTag();
+        if (status != NFA_STATUS_OK) {
+          LOG(ERROR) << StringPrintf("%s: can't format mifare classic tag",
+                                     __func__);
+          sem_destroy(&sFormatSem);
+          goto TheEnd;
+        }
       }
       sem_wait(&sFormatSem);
       sem_destroy(&sFormatSem);

nci/jni/NfcTag.cpp

diff --git a/nci/jni/NfcTag.cpp b/nci/jni/NfcTag.cpp
index 05b62bc..ca2a8df 100644
--- a/nci/jni/NfcTag.cpp
+++ b/nci/jni/NfcTag.cpp
@@ -73,6 +73,7 @@
       mNumDiscNtf(0),
       mNumDiscTechList(0),
       mTechListIndex(0),
+      mNfcDisableinProgress(false),
       mCashbeeDetected(false),
       mEzLinkTypeTag(false),
 #if (NXP_EXTNS == TRUE)

nci/jni/SecureElement.cpp

diff --git a/nci/jni/SecureElement.cpp b/nci/jni/SecureElement.cpp
index 77dee10..d1fe6fc 100755
--- a/nci/jni/SecureElement.cpp
+++ b/nci/jni/SecureElement.cpp
@@ -195,6 +195,7 @@
       mCurrentRouteSelection(NoRoute),
       mActualResponseSize(0),
       mAtrInfolen(0),
+      mAtrStatus(0),
       mUseOberthurWarmReset(false),
       mActivatedInListenMode(false),
       mOberthurWarmResetCommand(3),

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

diff --git a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
index b545045..78b3a8f 100644
--- a/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
+++ b/nci/jni/extns/pn54x/src/mifare/phFriNfc_MifareStdMap.cpp
@@ -1391,8 +1391,6 @@
     if (NdefMap->CardType == PH_FRINFC_NDEFMAP_MIFARE_STD_1K_CARD) {
       /* if Sector Id > 15 No Sectors to write */
       if (SectorID > 15) {
-        SectorID =
-            phFriNfc_MifStd_H_GetSect(NdefMap->StdMifareContainer.currentBlock);
         /*Error: No Ndef Compliant Sectors present */
         Result = PHNFCSTVAL(CID_FRI_NFC_NDEF_MAP, NFCSTATUS_INVALID_PARAMETER);
         callbreak = 1;
@@ -2700,18 +2698,11 @@
   if (*TL4bytesFlag == PH_FRINFC_MIFARESTD_FLAG0) {
     (*TempLength) += (NdefMap->SendRecvBuf[TempLen] + PH_FRINFC_MIFARESTD_VAL1);
 
-    if (NdefMap->TLVStruct.NdefTLVFoundFlag == PH_FRINFC_MIFARESTD_FLAG0) {
       LengthRemaining =
           (((*TempLength) < PH_FRINFC_MIFARESTD_BYTES_READ)
                ? PH_FRINFC_MIFARESTD_VAL0
                : (NdefMap->SendRecvBuf[TempLen] - LengthRemaining));
     } else {
-      LengthRemaining =
-          (((*TempLength) < PH_FRINFC_MIFARESTD_BYTES_READ)
-               ? PH_FRINFC_MIFARESTD_VAL0
-               : (NdefMap->SendRecvBuf[TempLen] - LengthRemaining));
-    }
-  } else {
     *TL4bytesFlag = PH_FRINFC_MIFARESTD_FLAG0;
     if (NdefMap->TLVStruct.NoLbytesinTLV == PH_FRINFC_MIFARESTD_VAL1) {
       ShiftLength = NdefMap->TLVStruct.prevLenByteValue;