bluetooth: ias: Fix dereferencing before NULL check

finikorg · nashif · commit 33b0c0db3868 · 2023-01-18T07:27:00.000-05:00
It does make sense to dereference after NULL check.

Signed-off-by: Andrei Emeltchenko &lt;andrei.emeltchenko@intel.com&gt;
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static uint8_t bt_ias_alert_lvl_disc_cb(struct bt_conn *conn,`
`96`	`96`	`const struct bt_gatt_attr *attr,`
`97`	`97`	`struct bt_gatt_discover_params *discover)`
`98`	`98`	`{`
`99`		`- const struct bt_gatt_chrc chrc = (struct bt_gatt_chrc )attr->user_data;`
	`99`	`+ const struct bt_gatt_chrc *chrc;`
`100`	`100`
`101`	`101`	`atomic_clear_bit(client_by_conn(conn)->flags, IAS_DISCOVER_IN_PROGRESS);`
`102`	`102`
`@@ -106,6 +106,8 @@ static uint8_t bt_ias_alert_lvl_disc_cb(struct bt_conn *conn,`
`106`	`106`	`return BT_GATT_ITER_STOP;`
`107`	`107`	`}`
`108`	`108`
	`109`	`+ chrc = (struct bt_gatt_chrc *)attr->user_data;`
	`110`	`+`
`109`	`111`	`client_by_conn(conn)->alert_level_handle = chrc->value_handle;`
`110`	`112`	`discover_complete(conn, 0);`
`111`	`113`