diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-14 01:08:22 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-14 01:08:22 +0000 |
| commit | 5e20b72e9f2ca81fdfdb7d480ef77485a86a3f06 (patch) | |
| tree | cd2f79fd4f7cc48132b252fc379b19d0655833c9 | |
| parent | dcbe2f2c9317dbed9bbb843f369a0c3cccce1c39 (diff) | |
| parent | 45a6ebae38070fee719cc022ab609a9f03f6cd16 (diff) | |
| download | platform_packages_apps_Nfc-5e20b72e9f2ca81fdfdb7d480ef77485a86a3f06.tar.gz platform_packages_apps_Nfc-5e20b72e9f2ca81fdfdb7d480ef77485a86a3f06.tar.bz2 platform_packages_apps_Nfc-5e20b72e9f2ca81fdfdb7d480ef77485a86a3f06.zip | |
Snap for 7360053 from 45a6ebae38070fee719cc022ab609a9f03f6cd16 to sc-release
Change-Id: I243b63f199c55a0289afe8dc578244970054bd42
| -rw-r--r-- | nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp | 9 | ||||
| -rw-r--r-- | src/com/android/nfc/handover/ConfirmConnectActivity.java | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp index 81ac416c..3ddc2ca8 100644 --- a/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp +++ b/nci/jni/extns/pn54x/src/mifare/phNxpExtns_MifareStd.cpp @@ -1132,6 +1132,10 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo, NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WRITE || NdefMap->State == PH_FRINFC_NDEFMAP_STATE_WR_NDEF_LEN || NdefMap->State == PH_FRINFC_NDEFMAP_STATE_INIT)) { + if (2 > RspBuffInfo->wLen) { + android_errorWriteLog(0x534e4554, "181346550"); + return NFCSTATUS_FAILED; + } uint8_t rspAck = RspBuffInfo->pBuff[RspBuffInfo->wLen - 2]; uint8_t rspAckMask = ((RspBuffInfo->pBuff[RspBuffInfo->wLen - 1]) & MAX_NUM_VALID_BITS_FOR_ACK); @@ -1145,6 +1149,11 @@ static NFCSTATUS phNciNfc_RecvMfResp(phNciNfc_Buff_t* RspBuffInfo, status = NFCSTATUS_SUCCESS; uint16_t wRecvDataSz = 0; + if ((PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE) > + RspBuffInfo->wLen) { + android_errorWriteLog(0x534e4554, "181346550"); + return NFCSTATUS_FAILED; + } /* DataLen = TotalRecvdLen - (sizeof(RspId) + sizeof(Status)) */ wPldDataSize = ((RspBuffInfo->wLen) - (PHNCINFC_EXTNID_SIZE + PHNCINFC_EXTNSTATUS_SIZE)); diff --git a/src/com/android/nfc/handover/ConfirmConnectActivity.java b/src/com/android/nfc/handover/ConfirmConnectActivity.java index 5574469a..159eee0c 100644 --- a/src/com/android/nfc/handover/ConfirmConnectActivity.java +++ b/src/com/android/nfc/handover/ConfirmConnectActivity.java @@ -44,8 +44,9 @@ public class ConfirmConnectActivity extends Activity { mDevice = launchIntent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); if (mDevice == null) finish(); Resources res = getResources(); + String btExtraName = launchIntent.getStringExtra(BluetoothDevice.EXTRA_NAME); String confirmString = String.format(res.getString(R.string.confirm_pairing), - launchIntent.getStringExtra(BluetoothDevice.EXTRA_NAME)); + "\"" + btExtraName.replaceAll("\\r|\\n", "") + "\""); builder.setMessage(confirmString) .setCancelable(false) .setPositiveButton(res.getString(R.string.pair_yes), |