From 33b0c0db3868552851770db0b6ba2c1f1bd49648 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Wed, 18 Jan 2023 11:55:33 +0200 Subject: [PATCH] bluetooth: ias: Fix dereferencing before NULL check It does make sense to dereference after NULL check. Signed-off-by: Andrei Emeltchenko --- subsys/bluetooth/services/ias/ias_client.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/subsys/bluetooth/services/ias/ias_client.c b/subsys/bluetooth/services/ias/ias_client.c index 27ee63ce46b..6b308a12feb 100644 --- a/subsys/bluetooth/services/ias/ias_client.c +++ b/subsys/bluetooth/services/ias/ias_client.c @@ -96,7 +96,7 @@ static uint8_t bt_ias_alert_lvl_disc_cb(struct bt_conn *conn, const struct bt_gatt_attr *attr, struct bt_gatt_discover_params *discover) { - const struct bt_gatt_chrc *chrc = (struct bt_gatt_chrc *)attr->user_data; + const struct bt_gatt_chrc *chrc; atomic_clear_bit(client_by_conn(conn)->flags, IAS_DISCOVER_IN_PROGRESS); @@ -106,6 +106,8 @@ static uint8_t bt_ias_alert_lvl_disc_cb(struct bt_conn *conn, return BT_GATT_ITER_STOP; } + chrc = (struct bt_gatt_chrc *)attr->user_data; + client_by_conn(conn)->alert_level_handle = chrc->value_handle; discover_complete(conn, 0);