Bluetooth: TBS: Guard check for MAX_TBS_INSTANCES

Thalley · carlescufi · commit f4550dbda8dc · 2023-06-29T21:06:14.000+02:00
Add check for CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES &gt; 1 before
comparing inst_cnt, as otherwise it was always false which
caused a coverity issue.

Signed-off-by: Emil Gydesen &lt;emil.gydesen@nordicsemi.no&gt;
diff --git a/subsys/bluetooth/audio/tbs_client.c b/subsys/bluetooth/audio/tbs_client.c
@@ -1589,7 +1589,8 @@ static uint8_t primary_discover_tbs(struct bt_conn *conn, const struct bt_gatt_a
 		srv_inst->current_inst->start_handle = attr->handle + 1;
 		srv_inst->current_inst->end_handle = prim_service->end_handle;
 
-		if (srv_inst->inst_cnt < CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES) {
+		if (CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES > 1 &&
+		    srv_inst->inst_cnt < CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES) {
 			return BT_GATT_ITER_CONTINUE;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1589,7 +1589,8 @@ static uint8_t primary_discover_tbs(struct bt_conn *conn, const struct bt_gatt_a`
`1589`	`1589`	`srv_inst->current_inst->start_handle = attr->handle + 1;`
`1590`	`1590`	`srv_inst->current_inst->end_handle = prim_service->end_handle;`
`1591`	`1591`
`1592`		`- if (srv_inst->inst_cnt < CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES) {`
	`1592`	`+ if (CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES > 1 &&`
	`1593`	`+ srv_inst->inst_cnt < CONFIG_BT_TBS_CLIENT_MAX_TBS_INSTANCES) {`
`1593`	`1594`	`return BT_GATT_ITER_CONTINUE;`
`1594`	`1595`	`}`
`1595`	`1596`	`}`