commit 14162741e7e7793b7735c80382441c3ec8986408
author Alisher Alikhodjaev <alisher@google.com> Fri Apr 30 23:55:46 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 30 23:55:46 2021 +0000
tree b2901dc0318361f3b272de9e21b886a6eb2da130
parent da947d51277c22aa80523bf57c4dd4bd6e1d3d18
parent 35f34f4d016cc693507e8036ceaf37c99db76837

Merge "Out of bounds read in hal_core_initialized" into rvc-qpr-dev

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]);