From 9130b61f1572497eff920abd23bac8ab42eae552 Mon Sep 17 00:00:00 2001
From: Guogang Li <guogang@google.com>
Date: Fri, 24 Mar 2023 19:21:43 -0700
Subject: [PATCH] Only handle possible advertising advertising packet for BLE
 V2

PiperOrigin-RevId: 519292612
---
 .../mediums/ble_v2/ble_advertisement_header.cc    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/connections/implementation/mediums/ble_v2/ble_advertisement_header.cc b/connections/implementation/mediums/ble_v2/ble_advertisement_header.cc
index dda3f692..d9e31774 100644
--- a/connections/implementation/mediums/ble_v2/ble_advertisement_header.cc
+++ b/connections/implementation/mediums/ble_v2/ble_advertisement_header.cc
@@ -64,10 +64,17 @@ BleAdvertisementHeader::BleAdvertisementHeader(
             config_package_nearby::nearby_connections_feature::kEnableBleV2)) {
       // The BLE advertisement header is not encoded in base64, but still try to
       // parse it as raw bytes.
-      NEARBY_LOG(
-          WARNING,
-          "Cannot deserialize BLEAdvertisementHeader: failed Base64 decoding");
-      advertisement_header_bytes = ble_advertisement_header_bytes;
+      if (ble_advertisement_header_bytes.size() ==
+              kMinAdvertisementHeaderLength ||
+          ble_advertisement_header_bytes.size() ==
+              kMinAdvertisementHeaderLength + 2) {
+        advertisement_header_bytes = ble_advertisement_header_bytes;
+      } else {
+        NEARBY_LOG(WARNING,
+                   "Cannot deserialize BLEAdvertisementHeader. Invalid "
+                   "advertising data.");
+        return;
+      }
     } else {
       NEARBY_LOG(
           ERROR,