From 144110596460e8dedb5442528197039aee585c6d Mon Sep 17 00:00:00 2001 From: Wootak Jung Date: Thu, 28 Jul 2022 08:28:30 +0900 Subject: [PATCH] Fix paired device array exceed issue bt-hal-adapter-dbus-handler.c: __bt_adapter_bonded_devices_cb(1765) >\ Send Adapter properties changed event to HAL user, Num Prop [1] total size [1031] Change-Id: I516b66587484c4a4ace363a34bf497ef319515b7 --- bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c index a30aa95..190d84f 100644 --- a/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c +++ b/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c @@ -1696,7 +1696,7 @@ static gboolean __bt_adapter_bonded_devices_cb(gpointer user_data) /* Buffer and propety count management */ uint8_t buf[BT_HAL_MAX_PROPERTY_BUF_SIZE]; uint8_t addresses[BT_HAL_MAX_PROPERTY_BUF_SIZE]; - struct hal_ev_adapter_props_changed *ev = (void*) buf;; + struct hal_ev_adapter_props_changed *ev = (void *)buf; size_t size = 0; size_t count = 0; @@ -1744,6 +1744,11 @@ static gboolean __bt_adapter_bonded_devices_cb(gpointer user_data) break; } } + + if (count >= (int)(sizeof(addresses) / BT_HAL_ADDRESS_LENGTH_MAX)) { + DBG("Reached the max length of addresses. do not stored anymore"); + break; + } } g_variant_iter_free(iter); -- 2.7.4