Merge branch 'pr-220'

alranel · alranel · commit 215f81187e18 · 2022-05-11T20:24:24.000+02:00
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@
 * https://github.com/arduino-libraries/ArduinoBLE/pull/134
 * https://github.com/arduino-libraries/ArduinoBLE/pull/156
 * https://github.com/arduino-libraries/ArduinoBLE/pull/183
+* https://github.com/arduino-libraries/ArduinoBLE/pull/220
 <!-- pull requests -->
 
 You can consider this as an experimental version of the library, that you can use to test features contributed by the community that haven't been merged yet.
diff --git a/src/utility/HCI.cpp b/src/utility/HCI.cpp
@@ -1119,6 +1119,10 @@ void HCIClass::handleEventPkt(uint8_t /*plen*/, uint8_t pdata[])
           uint8_t eirData[31];
         } *leAdvertisingReport = (EvtLeAdvertisingReport*)&pdata[sizeof(HCIEventHdr) + sizeof(LeMetaEventHeader)];
 
+        if(leAdvertisingReport->eirLength > sizeof(leAdvertisingReport->eirData)){
+          return;
+        }
+
         if (leAdvertisingReport->status == 0x01) {
           // last byte is RSSI
           int8_t rssi = leAdvertisingReport->eirData[leAdvertisingReport->eirLength];
