Merge pull request #11216 from paul-szczepanek-arm/fix-ad-parser

BLE: make advertising data parser handle early termination
2019-08-20 09:59:18 +02:00 · 2019-08-20 09:59:18 +02:00 · 7ee382bdc0
parent b2b1ac1977 8acd127640
commit 7ee382bdc0
1 changed files with 5 additions and 0 deletions
--- a/features/FEATURE_BLE/ble/gap/AdvertisingDataParser.h
+++ b/features/FEATURE_BLE/ble/gap/AdvertisingDataParser.h
@ -69,6 +69,11 @@ public:
        if (position >= data.size()) {
            return false;
        }
+        
+        /* early termination of packet, no more meaningful octets */
+        if (current_length() == 0) {
+            return false;
+        }

        if (position + current_length() >= data.size()) {
            return false;