michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: bluetooth: tester: Fix zero length array in middle of struct

Browse source 
Zero length arrays are only allowed at the end of the structure. Here
those were used as placeholders for BTP response creation and can be
easily replaced with common member.

Signed-off-by: Szymon Janc <szymon.janc@codecoup.pl>
This commit is contained in:
Szymon Janc 2024-07-01 11:32:49 +02:00 • committed by Anas Nashif
commit d434eac86f
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/bluetooth/tester/src/btp/btp_mesh.h
View file

@ -114,8 +114,7 @@ struct btp_mesh_health_generate_faults_rp {
uint8_t test_id;
uint8_t cur_faults_count;
uint8_t reg_faults_count;
uint8_t current_faults[0];
uint8_t registered_faults[0];
uint8_t faults[];
} __packed;
#define BTP_MESH_HEALTH_CLEAR_FAULTS 0x0c

4
tests/bluetooth/tester/src/btp_mesh.c
View file

@ -1734,12 +1734,12 @@ static uint8_t health_generate_faults(const void *cmd, uint16_t cmd_len,
cur_faults_count = MIN(sizeof(cur_faults), sizeof(some_faults));
memcpy(cur_faults, some_faults, cur_faults_count);
memcpy(rp->current_faults, cur_faults, cur_faults_count);
memcpy(rp->faults, cur_faults, cur_faults_count);
rp->cur_faults_count = cur_faults_count;
reg_faults_count = MIN(sizeof(reg_faults), sizeof(some_faults));
memcpy(reg_faults, some_faults, reg_faults_count);
memcpy(rp->registered_faults + cur_faults_count, reg_faults, reg_faults_count);
memcpy(rp->faults + cur_faults_count, reg_faults, reg_faults_count);
rp->reg_faults_count = reg_faults_count;
bt_mesh_health_srv_fault_update(&elements[0]);