| commit | c0e1f2e8d855d2276726611a8b9cdde3f3067c2a | [log] [tgz] |
|---|---|---|
| author | Alisher Alikhodjaev <alisher@google.com> | Tue May 04 00:13:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue May 04 00:13:45 2021 +0000 |
| tree | 4dc574e7e4ee0d63654716b4a89a7a240736178a | |
| parent | edff0bf51c9fca4a1421f4d631737b67df854431 [diff] | |
| parent | 096811e966ad6f5927490ca029c39c8728609259 [diff] |
Merge "Heap-buffer-overflow in nci_proc_ee_management_rsp" into sc-dev am: 096811e966 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/nfc/+/14390457 Change-Id: Ic055ea47b57131dfdc2f960653e67e5df28f04df
diff --git a/src/nfc/nci/nci_hrcv.cc b/src/nfc/nci/nci_hrcv.cc index 6dc1ae4..dfa16e4 100644 --- a/src/nfc/nci/nci_hrcv.cc +++ b/src/nfc/nci/nci_hrcv.cc
@@ -356,6 +356,8 @@ nfc_response.mode_set.status = *pp; } else { nfc_response.mode_set.status = NFC_STATUS_FAILED; + android_errorWriteLog(0x534e4554, "176203800"); + return; } nfc_response.mode_set.nfcee_id = *p_old++; nfc_response.mode_set.mode = *p_old++;