commit 26bb48d97259acc60ae8bb772b022a3803079960
author Alisher Alikhodjaev <alisher@google.com> Sat May 01 00:54:35 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat May 01 00:54:35 2021 +0000
tree 7bf2e6ed99aca60ec58437df5df377fcfe7b9e0b
parent fa7082c15bc66d96fdf7bdda91c0ee84de70acd1
parent 8716375c320359efdf613770de0693f71e72ab21

Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev am: 14162741e7 am: 57fc648599 am: 8716375c32

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14204915

Change-Id: Ibdf1aff8680374e4ee13af57d162910b154b8f5e

nfc/1.0/default/Nfc.cpp

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, &copy[0]);