| commit | 3d09d5d963a32b9c76039f1a380f80b1f40e8a98 | [log] [tgz] |
|---|---|---|
| author | Alisher Alikhodjaev <alisher@google.com> | Sat May 01 01:16:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat May 01 01:16:57 2021 +0000 |
| tree | 7bf2e6ed99aca60ec58437df5df377fcfe7b9e0b | |
| parent | 6cfa0dde9f0c2052328cceacb04f5d417372af0d [diff] | |
| parent | 26bb48d97259acc60ae8bb772b022a3803079960 [diff] |
Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev am: 14162741e7 am: 57fc648599 am: 8716375c32 am: 26bb48d972 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14204915 Change-Id: I0c069952bd323514210220b41df6a6fa55d7332a
diff --git a/nfc/1.0/default/Nfc.cpp b/nfc/1.0/default/Nfc.cpp index fcdcbbc..a1e50f0 100644 --- a/nfc/1.0/default/Nfc.cpp +++ b/nfc/1.0/default/Nfc.cpp
@@ -38,7 +38,7 @@ ::android::hardware::Return<NfcStatus> Nfc::coreInitialized(const hidl_vec<uint8_t>& data) { hidl_vec<uint8_t> copy = data; - if (mDevice == nullptr) { + if (mDevice == nullptr || copy.size() == 0) { return NfcStatus::FAILED; } int ret = mDevice->core_initialized(mDevice, ©[0]);