test: bluetooth/tester: fix ccc_find_by_attr

npal-cy · nashif · commit 36fb0279d28d · 2024-06-15T04:43:31.000-04:00
Added check if ccc_values[i].attr != NULL,
before accessing to ccc_values[i].attr structure:
(handle == ccc_values[i].attr-&gt;handle)

On 20829 platform it's causing hard fault, not sure about
another platforms (in GAP testing).

Signed-off-by: Nazar Palamar &lt;nazar.palamar@infineon.com&gt;
diff --git a/tests/bluetooth/tester/src/btp_gatt.c b/tests/bluetooth/tester/src/btp_gatt.c
@@ -100,7 +100,7 @@ static struct ccc_value ccc_values[MAX_CCC_COUNT];
 static int ccc_find_by_attr(uint16_t handle)
 {
 	for (int i = 0; i < MAX_CCC_COUNT; i++) {
-		if (handle == ccc_values[i].attr->handle) {
+		if ((ccc_values[i].attr != NULL) && (handle == ccc_values[i].attr->handle)) {
 			return i;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ static struct ccc_value ccc_values[MAX_CCC_COUNT];`
`100`	`100`	`static int ccc_find_by_attr(uint16_t handle)`
`101`	`101`	`{`
`102`	`102`	`for (int i = 0; i < MAX_CCC_COUNT; i++) {`
`103`		`- if (handle == ccc_values[i].attr->handle) {`
	`103`	`+ if ((ccc_values[i].attr != NULL) && (handle == ccc_values[i].attr->handle)) {`
`104`	`104`	`return i;`
`105`	`105`	`}`
`106`	`106`	`}`