From 4dd123fd8a9f33769348a29c9f90d00a6ad8341f Mon Sep 17 00:00:00 2001 From: Eric Betts Date: Mon, 7 Apr 2025 08:16:42 -0700 Subject: [PATCH] BLE: Slightly increase mfg_data size (#4177) Co-authored-by: hedger --- targets/f7/ble_glue/gap.c | 4 ++-- targets/f7/ble_glue/gap.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/targets/f7/ble_glue/gap.c b/targets/f7/ble_glue/gap.c index 1fe898ea9..70c9d1c6f 100644 --- a/targets/f7/ble_glue/gap.c +++ b/targets/f7/ble_glue/gap.c @@ -24,7 +24,7 @@ typedef struct { uint8_t adv_svc_uuid_len; uint8_t adv_svc_uuid[20]; uint8_t mfg_data_len; - uint8_t mfg_data[20]; + uint8_t mfg_data[23]; char* adv_name; } GapSvc; @@ -326,7 +326,7 @@ static void set_advertisment_service_uid(uint8_t* uid, uint8_t uid_len) { } static void set_manufacturer_data(uint8_t* mfg_data, uint8_t mfg_data_len) { - furi_check(mfg_data_len < sizeof(gap->service.mfg_data) - 2); + furi_check(mfg_data_len <= sizeof(gap->service.mfg_data) - 2); gap->service.mfg_data[0] = mfg_data_len + 1; gap->service.mfg_data[1] = AD_TYPE_MANUFACTURER_SPECIFIC_DATA; memcpy(&gap->service.mfg_data[gap->service.mfg_data_len], mfg_data, mfg_data_len); diff --git a/targets/f7/ble_glue/gap.h b/targets/f7/ble_glue/gap.h index d37fd9a1e..b2bf0ffc1 100644 --- a/targets/f7/ble_glue/gap.h +++ b/targets/f7/ble_glue/gap.h @@ -73,7 +73,7 @@ typedef struct { uint16_t Service_UUID_16; uint8_t Service_UUID_128[16]; } adv_service; - uint8_t mfg_data[20]; + uint8_t mfg_data[23]; uint8_t mfg_data_len; uint16_t appearance_char; bool bonding_mode;