Bluetooth: gatt: Fix infinite read_by_uuid procedure

MariuszSkamra · nashif · commit 919aa1785a0c · 2019-07-02T16:56:47.000-04:00
The attribute handle used to read next attribute has to be incremented
to not loop reading the same attribute.

Signed-off-by: Mariusz Skamra &lt;mariusz.skamra@codecoup.pl&gt;
diff --git a/subsys/bluetooth/host/gatt.c b/subsys/bluetooth/host/gatt.c
@@ -2415,6 +2415,14 @@ static void parse_read_by_uuid(struct bt_conn *conn,
 		if (rsp->len > length) {
 			break;
 		}
+
+		/* Stop if it's the last handle to be read */
+		if (params->by_uuid.start_handle == params->by_uuid.end_handle) {
+			params->func(conn, 0, params, NULL, 0);
+			return;
+		}
+
+		params->by_uuid.start_handle++;
 	}
 
 	/* Continue reading the attributes */

Original file line number	Diff line number	Diff line change
`@@ -2415,6 +2415,14 @@ static void parse_read_by_uuid(struct bt_conn *conn,`
`2415`	`2415`	`if (rsp->len > length) {`
`2416`	`2416`	`break;`
`2417`	`2417`	`}`
	`2418`	`+`
	`2419`	`+ /* Stop if it's the last handle to be read */`
	`2420`	`+ if (params->by_uuid.start_handle == params->by_uuid.end_handle) {`
	`2421`	`+ params->func(conn, 0, params, NULL, 0);`
	`2422`	`+ return;`
	`2423`	`+ }`
	`2424`	`+`
	`2425`	`+ params->by_uuid.start_handle++;`
`2418`	`2426`	`}`
`2419`	`2427`
`2420`	`2428`	`/* Continue reading the attributes */`